diff --git a/EstateManagement.BusinessLogic/Services/EstateDomainService.cs b/EstateManagement.BusinessLogic/Services/EstateDomainService.cs
index b13609e5..cc4ed492 100644
--- a/EstateManagement.BusinessLogic/Services/EstateDomainService.cs
+++ b/EstateManagement.BusinessLogic/Services/EstateDomainService.cs
@@ -124,7 +124,9 @@ public async Task<Guid> CreateEstateUser(Guid estateId,
                                                       Claims = new Dictionary<String, String>()
                                                   };
 
-            createUserRequest.Roles.Add("Estate");
+            // Check if role has been overridden
+            String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");
+            createUserRequest.Roles.Add(String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName);
             createUserRequest.Claims.Add("EstateId", estateId.ToString());
             
             CreateUserResponse createUserResponse = await this.SecurityServiceClient.CreateUser(createUserRequest, cancellationToken);
diff --git a/EstateManagement.BusinessLogic/Services/MerchantDomainService.cs b/EstateManagement.BusinessLogic/Services/MerchantDomainService.cs
index 3ab4c992..8123e7ac 100644
--- a/EstateManagement.BusinessLogic/Services/MerchantDomainService.cs
+++ b/EstateManagement.BusinessLogic/Services/MerchantDomainService.cs
@@ -211,7 +211,8 @@ public async Task<Guid> CreateMerchantUser(Guid estateId,
                                                       Claims = new Dictionary<String, String>()
                                                   };
 
-            createUserRequest.Roles.Add("Merchant");
+            String merchantRoleName = Environment.GetEnvironmentVariable("MerchantRoleName");
+            createUserRequest.Roles.Add(String.IsNullOrEmpty(merchantRoleName) ? "Merchant" : merchantRoleName);
             createUserRequest.Claims.Add("EstateId", estateId.ToString());
             createUserRequest.Claims.Add("MerchantId", merchantId.ToString());