diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
index d77e49a3..4ae3fdaf 100644
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
@@ -44,7 +44,7 @@
       </AuthenticationStep>
     </AuthenticationSteps>
     <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-    <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+    <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
   </LocalAndOutBoundAuthenticationConfig>
   <RequestPathAuthenticatorConfigs>
   </RequestPathAuthenticatorConfigs>
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
index 2c7c52d9..156eb6e1 100644
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
@@ -44,7 +44,7 @@
             </AuthenticationStep>
         </AuthenticationSteps>
         <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-        <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+        <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
     </LocalAndOutBoundAuthenticationConfig>
     <RequestPathAuthenticatorConfigs>
     </RequestPathAuthenticatorConfigs>
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml
index 3cd65666..7f84e5ab 100644
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml
@@ -44,7 +44,7 @@
             </AuthenticationStep>
         </AuthenticationSteps>
         <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-        <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+        <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
     </LocalAndOutBoundAuthenticationConfig>
     <RequestPathAuthenticatorConfigs>
     </RequestPathAuthenticatorConfigs>
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml
index 33a4736d..503833ce 100644
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml
@@ -44,7 +44,7 @@
       </AuthenticationStep>
     </AuthenticationSteps>
     <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-    <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+    <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
   </LocalAndOutBoundAuthenticationConfig>
   <RequestPathAuthenticatorConfigs>
   </RequestPathAuthenticatorConfigs>
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml b/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml
index 9503a87d..27bb258e 100644
--- a/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml
+++ b/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml
@@ -44,7 +44,7 @@
       </AuthenticationStep>
     </AuthenticationSteps>
     <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
-    <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+    <UseTenantDomainInUsername>false</UseTenantDomainInUsername>
   </LocalAndOutBoundAuthenticationConfig>
   <RequestPathAuthenticatorConfigs>
   </RequestPathAuthenticatorConfigs>