diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/Program.cs b/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/Program.cs
index e2b78e8..d31973e 100644
--- a/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/Program.cs
+++ b/src/Feijuca.Keycloak.TokenManager/TokenManager.Api/Program.cs
@@ -17,12 +17,12 @@
     .AddEnvironmentVariables();
 
 var applicationSettings = builder.Configuration.GetApplicationSettings(builder.Environment);
-Console.WriteLine(JsonConvert.SerializeObject(applicationSettings));
 
-builder.Services.AddSingleton<ISettings>(applicationSettings);
-
-builder.Services.AddControllers();
+builder.Services
+    .AddSingleton<ISettings>(applicationSettings)
+    .AddControllers();
 
+builder.Services.AddSwagger(applicationSettings!.AuthSettings!);
 builder.Services
     .AddExceptionHandler<GlobalExceptionHandler>()
     .AddProblemDetails()
@@ -30,8 +30,17 @@
     .AddLoggingDependency()
     .AddMediator()
     .AddRepositories(applicationSettings.AuthSettings)
-    .AddEndpointsApiExplorer()
-    .AddSwagger(applicationSettings!.AuthSettings!);
+    .AddEndpointsApiExplorer()    
+    .AddCors(options =>
+    {
+        options.AddPolicy("AllowAllOrigins", policy =>
+        {
+            policy
+                .AllowAnyOrigin()
+                .AllowAnyMethod()
+                .AllowAnyHeader();
+        });
+    });
 
 var app = builder.Build();
 
diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Commands/Users/CreateUserCommandHandler.cs b/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Commands/Users/CreateUserCommandHandler.cs
index c5d57bb..eb7edf5 100644
--- a/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Commands/Users/CreateUserCommandHandler.cs
+++ b/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Commands/Users/CreateUserCommandHandler.cs
@@ -11,7 +11,7 @@ public class CreateUserCommandHandler(IUserRepository userRepository) : IRequest
 
         public async Task<Result> Handle(CreateUserCommand request, CancellationToken cancellationToken)
         {
-            var resultUserCreated = await _userRepository.CreateNewUserActions(request.Tenant, request.AddUserRequest.ToDomain(request.Tenant));
+            var resultUserCreated = await _userRepository.CreateNewUserActions(request.Tenant, request.AddUserRequest.ToDomain());
             if (resultUserCreated.IsSuccess)
             {
                 return Result.Success();
diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Mappers/UserMapper.cs b/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Mappers/UserMapper.cs
index c95f0f7..7c0b747 100644
--- a/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Mappers/UserMapper.cs
+++ b/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Mappers/UserMapper.cs
@@ -6,15 +6,15 @@ namespace TokenManager.Application.Services.Mappers
 {
     public static class UserMapper
     {
-        public static User ToDomain(this AddUserRequest userRequest, string tenant)
+        public static User ToDomain(this AddUserRequest userRequest)
         {
-            var attributes = userRequest.Attributes!.ToDomain(tenant);
+            var attributes = userRequest.Attributes!.ToDomain();
             return new User(userRequest.Username!, userRequest.Password, userRequest.Email!, userRequest.FirstName!, userRequest.LastName!, attributes);
         }
 
-        public static Attributes ToDomain(this AttributesRequest attributes, string tenant)
+        public static Attributes ToDomain(this AttributesRequest attributes)
         {
-            return new Attributes(attributes.ZoneInfo, attributes.Birthdate, attributes.PhoneNumber, attributes.Gender, attributes.Fullname, tenant, attributes.Picture);
+            return new Attributes(attributes.ZoneInfo, attributes.Birthdate, attributes.PhoneNumber, attributes.Gender, attributes.Fullname, attributes.Tenant, attributes.Picture);
         }
 
         public static User ToDomain(this LoginUserRequest loginUserRequest, string tenant)
diff --git a/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Requests/User/AttributesRequest.cs b/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Requests/User/AttributesRequest.cs
index de7c136..43943bd 100644
--- a/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Requests/User/AttributesRequest.cs
+++ b/src/Feijuca.Keycloak.TokenManager/TokenManager.Application.Services/Requests/User/AttributesRequest.cs
@@ -1,4 +1,4 @@
 namespace TokenManager.Application.Services.Requests.User
 {
-    public record AttributesRequest(string? ZoneInfo, string? Birthdate, string? PhoneNumber, string? Gender, string? Fullname, string? Picture);
+    public record AttributesRequest(string? Tenant, string? ZoneInfo, string? Birthdate, string? PhoneNumber, string? Gender, string? Fullname, string? Picture);
 }