diff --git a/apps/console/src/app.tsx b/apps/console/src/app.tsx
index 28a26ed17eb..afe5934f536 100755
--- a/apps/console/src/app.tsx
+++ b/apps/console/src/app.tsx
@@ -94,14 +94,14 @@ export const App: FunctionComponent<Record<string, never>> = (): ReactElement =>
     const [ baseRoutes, setBaseRoutes ] = useState<RouteInterface[]>(getBaseRoutes());
     const [ sessionTimedOut, setSessionTimedOut ] = useState<boolean>(false);
     const [ orgId, setOrgId ] = useState<string>();
-    const [ featureGateConfigData, setFeatureGateConfigData ] = 
+    const [ featureGateConfigData, setFeatureGateConfigData ] =
         useState<FeatureGateInterface | null>(featureGateConfigUpdated);
 
-    const { 
-        data: allFeatures,
-        error: featureGateAPIException 
-    } = useGetAllFeatures(orgId, state.isAuthenticated);
-
+    // const {
+    //     data: allFeatures,
+    //     error: featureGateAPIException
+    // } = useGetAllFeatures(orgId, state.isAuthenticated);
+    const allFeatures = []
     useEffect(() => {
         if(state.isAuthenticated) {
             if (OrganizationUtils.isSuperOrganization(store.getState().organization.organization)
@@ -121,7 +121,7 @@ export const App: FunctionComponent<Record<string, never>> = (): ReactElement =>
     }, [ state ]);
 
     useEffect(() => {
-        if (allFeatures instanceof IdentityAppsApiException || featureGateAPIException) {
+        if (allFeatures instanceof IdentityAppsApiException) {
             return;
         }
 
@@ -135,13 +135,13 @@ export const App: FunctionComponent<Record<string, never>> = (): ReactElement =>
                 const path: string = feature.featureIdentifier.replace(/-/g, ".");
                 // Obtain the status and set it to the feature gate config.
                 const featureStatusPath: string = `${ path }.status`;
-    
+
                 set(featureGateConfigUpdated,featureStatusPath, feature.featureStatus);
-    
+
                 const featureTagPath: string = `${ path }.tags`;
-                
+
                 set(featureGateConfigUpdated,featureTagPath, feature.featureTags);
-                
+
                 setFeatureGateConfigData(featureGateConfigUpdated);
             });
         }
diff --git a/apps/console/src/auth.html b/apps/console/src/auth.html
index d5cf54c303d..6e3695a5ad5 100644
--- a/apps/console/src/auth.html
+++ b/apps/console/src/auth.html
@@ -161,9 +161,22 @@
                     ? userAccessedPath.split("utype=")[1]
                     : null;
 
-                const urlParams = new URLSearchParams(window.location.search);
+                if (userTenant) {
+                   sessionStorage.setItem("user_tenant", userTenant);
+                }
 
+                const urlParams = new URLSearchParams(window.location.search);
+                var isPrivilegedUser = false;
+                var tenantReplacement = "a";
                 var serverOrigin = startupConfig.serverUrl;
+                if (userTenant) {
+                    isPrivilegedUser = true;
+                    serverOrigin = startupConfig.serverUrl;
+                    tenantReplacement = userTenant;
+                } else {
+                    isPrivilegedUser = false;
+                    serverOrigin = "https://api.eu.asg.io";
+                }
                 var authorizationCode = urlParams.get("code");
                 var authSessionState = urlParams.get("session_state");
 
@@ -213,7 +226,7 @@
 
                     var basePath = applicationDomain.replace(/\/+$/, '') + getOrganizationPath();
                     var baseRedirectURL = "<%= htmlWebpackPlugin.options.basename%>" ? basePath + '/' + "<%= htmlWebpackPlugin.options.basename%>" : basePath;
-
+                    var loginTenant = userTenant.replace(/\/+$/, "");
                     var authConfig = {
                         signInRedirectURL: baseRedirectURL,
                         signOutRedirectURL: baseRedirectURL,
@@ -227,20 +240,24 @@
                         endpoints: {
                             authorizationEndpoint: getApiPath(
                                 userTenant
-                                    ? "/" + startupConfig.tenantPrefix + "/" + startupConfig.superTenantProxy + startupConfig.pathExtension + "/oauth2/authorize" + "?ut=" +
+                                    ? "/" + startupConfig.tenantPrefix + "/" + loginTenant + startupConfig.pathExtension + "/oauth2/authorize" + "?ut=" +
                                         userTenant.replace(/\/+$/, "") +
                                         (utype ? "&utype=" + utype : "")
-                                    : "/" + startupConfig.tenantPrefix + "/" + startupConfig.superTenantProxy + startupConfig.pathExtension + "/oauth2/authorize"
+                                    : "/" + startupConfig.tenantPrefix + "/" + loginTenant + startupConfig.pathExtension + "/oauth2/authorize"
                             ),
                             clockTolerance: 300,
-                            jwksEndpointURL: undefined,
+                            jwksEndpointURL: getApiPath(
+                                "/" + startupConfig.tenantPrefix + "/" + loginTenant + startupConfig.pathExtension + "/oauth2/jwks"
+                            ),
                             logoutEndpointURL: getApiPath(
-                                "/" + startupConfig.tenantPrefix + "/" + startupConfig.superTenantProxy + startupConfig.pathExtension + "/oidc/logout"
+                                "/" + startupConfig.tenantPrefix + "/" + loginTenant + startupConfig.pathExtension + "/oidc/logout"
                             ),
                             oidcSessionIFrameEndpointURL: getApiPath(
-                                "/" + startupConfig.tenantPrefix + "/" + startupConfig.superTenantProxy + startupConfig.pathExtension + "/oidc/checksession"
+                                "/" + startupConfig.tenantPrefix + "/" + loginTenant + startupConfig.pathExtension + "/oidc/checksession"
+                            ),
+                            tokenEndpointURL: getApiPath(
+                                "/" + startupConfig.tenantPrefix + "/" + loginTenant + startupConfig.pathExtension + "/oauth2/token"
                             ),
-                            tokenEndpointURL: undefined,
                             tokenRevocationEndpointURL: undefined
                         },
                         enablePKCE: true
diff --git a/apps/console/src/extensions/components/tenants/api/tenants.ts b/apps/console/src/extensions/components/tenants/api/tenants.ts
index 479348dd29c..5d9c46556e8 100644
--- a/apps/console/src/extensions/components/tenants/api/tenants.ts
+++ b/apps/console/src/extensions/components/tenants/api/tenants.ts
@@ -23,6 +23,7 @@ import { AxiosError, AxiosRequestConfig, AxiosResponse } from "axios";
 import { store } from "../../../../features/core/store";
 import { getTenantResourceEndpoints } from "../configs";
 import { TenantRequestResponse } from "../models";
+import { EnvironmentRequestResponse } from "../models";
 
 export const getDomainQueryParam = (): string => {
     const tenantDomain: string = store.getState().auth.tenantDomain;
@@ -30,6 +31,19 @@ export const getDomainQueryParam = (): string => {
     return `?domain=${ tenantDomain }`;
 };
 
+const getUsernameQueryParam = (): string => {
+    // const username: string = store.getState()?.auth?.username;
+    const userId: string = store.getState()?.environment?.loggedInUserId;
+
+    return `&userUUID=${ userId }`;
+};
+
+const getUserIdQueryParam = (): string => {
+    const userId: string = store.getState()?.environment?.loggedInUserId;
+
+    return `&userId=${ userId }`;
+};
+
 const isPrivilegedUser = (): boolean => {
     const isPrivileged: boolean = store.getState()?.auth?.isPrivilegedUser ?? false;
 
@@ -48,17 +62,21 @@ const httpClient: HttpClientInstance = AsgardeoSPAClient.getInstance()
  *
  * @param tenantName - new tenant name
  */
-export const addNewTenant = (tenantName: string): Promise<AxiosResponse> => {
+export const addNewTenant = (tenantName: string, deploymentUUID: string): Promise<AxiosResponse> => {
     const requestConfig: AxiosRequestConfig = {
         data: {
-            domain: tenantName
-        },
+                    "orgName": tenantName,
+                    "defaultEnvName": "prod",
+                    "deploymentUUIDForDefaultEnv": deploymentUUID,
+                    "isDefault": false
+                },
+
         headers: {
             "Access-Control-Allow-Origin": store.getState().config.deployment.clientOrigin,
             "Content-Type": "application/json"
         },
         method: HttpMethods.POST,
-        url: getTenantResourceEndpoints().tenantManagementApi + getDomainQueryParam()
+        url: getTenantResourceEndpoints().tenantManagementApi + "/organization" + getDomainQueryParam()
     };
 
     return httpClient(requestConfig)
@@ -104,7 +122,8 @@ export const checkDuplicateTenants = (tenantName: string): Promise<AxiosResponse
             "Access-Control-Allow-Origin": store.getState().config.deployment.clientOrigin
         },
         method: HttpMethods.HEAD,
-        url: getTenantResourceEndpoints().tenantManagementApi + "/" + tenantName + getDomainQueryParam()
+        url: getTenantResourceEndpoints().tenantManagementApi + "/organization/check-org" + getDomainQueryParam() +
+            "&orgName=" + tenantName + getUsernameQueryParam()
     };
 
     return httpClient(requestConfig)
@@ -121,23 +140,26 @@ export const checkDuplicateTenants = (tenantName: string): Promise<AxiosResponse
  *
  * @returns - A promise that resolves with the tenant request response object.
  */
-export const getAssociatedTenants = (): Promise<TenantRequestResponse> => {
+export const getAssociatedTenants = (): Promise<EnvironmentRequestResponse []> => {
     const orgType: OrganizationType = store.getState().organization.organizationType;
 
     // If the user is a privileged user or the function is being called inside a suborganization,
     // return an empty response.
     if (isPrivilegedUser() || orgType === OrganizationType.SUBORGANIZATION) {
-        return Promise.resolve({
-            associatedTenants: [],
-            count: 0,
-            startIndex: 0,
-            totalResults: 0
-        });
+        return Promise.resolve([{
+                    orgName: "",
+                    orgUUID: "",
+                    environments: []
+                }]);
     }
 
     const requestConfig: AxiosRequestConfig = {
+        headers: {
+                    "Access-Control-Allow-Origin": store.getState().config.deployment.clientOrigin
+                },
         method: HttpMethods.GET,
-        url: getTenantResourceEndpoints().tenantAssociationApi + getDomainQueryParam()
+        // url: getTenantResourceEndpoints().tenantAssociationApi + getDomainQueryParam()
+        url: getTenantResourceEndpoints().tenantManagementApi + "/user-association/user/me" + getDomainQueryParam() + getUserIdQueryParam()
     };
 
     return httpClient(requestConfig)
@@ -148,3 +170,21 @@ export const getAssociatedTenants = (): Promise<TenantRequestResponse> => {
             return Promise.reject(error?.response?.data);
         });
 };
+
+/**
+ * Get the deployments associated with the current user.
+ */
+export const getDeployments = (): Promise<AxiosResponse> => {
+
+    const requestConfig: AxiosRequestConfig = {
+        url: getTenantResourceEndpoints().tenantManagementApi + "/deployment" + getDomainQueryParam()
+    };
+
+    return httpClient(requestConfig)
+        .then((response: AxiosResponse) => {
+            return Promise.resolve(response);
+        })
+        .catch((error: AxiosError) => {
+            return Promise.reject(error?.response?.data);
+        });
+};
diff --git a/apps/console/src/extensions/components/tenants/components/add-modal/add-tenant.tsx b/apps/console/src/extensions/components/tenants/components/add-modal/add-tenant.tsx
index 3184d930df5..baa4aedf110 100644
--- a/apps/console/src/extensions/components/tenants/components/add-modal/add-tenant.tsx
+++ b/apps/console/src/extensions/components/tenants/components/add-modal/add-tenant.tsx
@@ -16,6 +16,7 @@
  * under the License.
  */
 
+import { useAuthContext } from "@asgardeo/auth-react";
 import { AlertInterface, AlertLevels, TestableComponentInterface } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
 import { useTrigger } from "@wso2is/forms";
@@ -78,6 +79,8 @@ export const AddTenantWizard: FunctionComponent<AddTenantWizardPropsInterface> =
         }
     }, [ submissionValue, finishSubmit ]);
 
+    const { updateConfig } = useAuthContext();
+
     const handleFormSubmit = (): void => {
         setIsNewTenantLoading(true);
         setTenantLoaderText(
@@ -99,7 +102,7 @@ export const AddTenantWizard: FunctionComponent<AddTenantWizardPropsInterface> =
             .catch((error: AxiosError) => {
                 if (error.response.status == 404) {
                     // Proceed to tenant creation if tenant does not exist.
-                    addTenant(submissionValue.tenantName);
+                    addTenant(submissionValue.tenantName, submissionValue.deploymentUUID);
                 } else {
                     setIsNewTenantLoading(false);
                     setAlert({
@@ -140,10 +143,10 @@ export const AddTenantWizard: FunctionComponent<AddTenantWizardPropsInterface> =
         title: t("extensions:manage.features.tenant.wizards.addTenant.heading")
     } ];
 
-    const addTenant = (tenantName: string): void => {
+    const addTenant = (tenantName: string, deploymentUUID: string): void => {
         setIsNewTenantLoading(true);
         setTenantLoaderText(t("extensions:manage.features.tenant.wizards.addTenant.forms.loaderMessages.tenantCreate"));
-        addNewTenant(tenantName)
+        addNewTenant(tenantName, deploymentUUID)
             .then((response: AxiosResponse) => {
                 if (response.status === 201) {
                     eventPublisher.publish("create-new-organization");
diff --git a/apps/console/src/extensions/components/tenants/components/dropdown/tenant-dropdown.tsx b/apps/console/src/extensions/components/tenants/components/dropdown/tenant-dropdown.tsx
index 73edf384c6c..e13cdc57573 100644
--- a/apps/console/src/extensions/components/tenants/components/dropdown/tenant-dropdown.tsx
+++ b/apps/console/src/extensions/components/tenants/components/dropdown/tenant-dropdown.tsx
@@ -55,7 +55,7 @@ import { OrganizationType } from "../../../../../features/organizations/constant
 import { useGetCurrentOrganizationType } from "../../../../../features/organizations/hooks/use-get-organization-type";
 import { FeatureGateConstants } from "../../../feature-gate/constants/feature-gate";
 import { getAssociatedTenants, makeTenantDefault } from "../../api";
-import { TenantInfo, TenantRequestResponse, TriggerPropTypesInterface } from "../../models";
+import { TenantInfo, TenantRequestResponse, TriggerPropTypesInterface, EnvironmentInfo, EnvironmentRequestResponse } from "../../models";
 import { handleTenantSwitch } from "../../utils";
 import { AddTenantWizard } from "../add-modal";
 
@@ -124,19 +124,27 @@ const TenantDropdown: FunctionComponent<TenantDropdownInterface> = (props: Tenan
     useEffect(() => {
         if (!isPrivilegedUser && saasFeatureStatus !== FeatureStatus.DISABLED) {
             getAssociatedTenants()
-                .then((response: TenantRequestResponse) => {
+                .then((response: EnvironmentRequestResponse []) => {
                     let defaultDomain: string = "";
                     const tenants: string[] = [];
+                    const associatedTenants: TenantInfo[] = [];
 
-                    response.associatedTenants.forEach((tenant: TenantInfo) => {
-                        if (tenant.default) {
-                            defaultDomain = tenant.domain;
+                    response.forEach((environmentRequestResponse: EnvironmentRequestResponse) => {
+                        environmentRequestResponse.environments.forEach((environment: EnvironmentInfo) => {
+                        if (environment.isDefault) {
+                            defaultDomain = environmentRequestResponse.orgName;
                         }
-
-                        tenants.push(tenant.domain);
+                        });
+                        tenants.push(environmentRequestResponse.orgName);
+                        associatedTenants.push({
+                                                    id: environmentRequestResponse.orgUUID,
+                                                    domain: environmentRequestResponse.orgName,
+                                                    default: defaultDomain == environmentRequestResponse.orgName,
+                                                    associationType: "member"
+                                                });
                     });
 
-                    dispatch(setTenants<TenantInfo>(response.associatedTenants));
+                    dispatch(setTenants<TenantInfo>(associatedTenants));
                     setAssociatedTenants(tenants);
                     setDefaultTenant(defaultDomain);
                 })
@@ -383,7 +391,7 @@ const TenantDropdown: FunctionComponent<TenantDropdownInterface> = (props: Tenan
                         <Dropdown.Menu className="tenant-dropdown-menu" onClick={ handleDropdownClick }>
                             <Item.Group className="current-tenant" unstackable>
                                 <Item
-                                    className={ isSubOrg ? "header sub-org-header" : "header" } 
+                                    className={ isSubOrg ? "header sub-org-header" : "header" }
                                     key={ "current-tenant" }
                                 >
                                     {
@@ -434,7 +442,7 @@ const TenantDropdown: FunctionComponent<TenantDropdownInterface> = (props: Tenan
                                                             data-inverted
                                                             data-tooltip={ isCopying
                                                                 ? t("extensions:manage.features.tenant." +
-                                                                    "header.copied") 
+                                                                    "header.copied")
                                                                 : t("extensions:manage.features.tenant." +
                                                                     "header.copyOrganizationId")
                                                             }
@@ -474,7 +482,7 @@ const TenantDropdown: FunctionComponent<TenantDropdownInterface> = (props: Tenan
                                                     disabled={ true }
                                                 >
                                                     <BuildingCircleCheckIcon fill="black" />
-                                                    { 
+                                                    {
                                                         t("extensions:manage.features.tenant." +
                                                             "header.makeDefaultOrganization")
                                                     }
@@ -490,7 +498,7 @@ const TenantDropdown: FunctionComponent<TenantDropdownInterface> = (props: Tenan
                                                     disabled={ isSetDefaultTenantInProgress }
                                                 >
                                                     <BuildingCircleCheckIcon fill="black" />
-                                                    { 
+                                                    {
                                                         t("extensions:manage.features.tenant." +
                                                             "header.makeDefaultOrganization")
                                                     }
diff --git a/apps/console/src/extensions/components/tenants/components/dropdown/tenant-switch-dropdown.tsx b/apps/console/src/extensions/components/tenants/components/dropdown/tenant-switch-dropdown.tsx
index ba69ac35242..82d8b82484a 100644
--- a/apps/console/src/extensions/components/tenants/components/dropdown/tenant-switch-dropdown.tsx
+++ b/apps/console/src/extensions/components/tenants/components/dropdown/tenant-switch-dropdown.tsx
@@ -34,7 +34,7 @@ import { OrganizationManagementConstants } from "../../../../../features/organiz
 import { OrganizationInterface } from "../../../../../features/organizations/models";
 import { ReactComponent as CrossIcon } from "../../../../../themes/default/assets/images/icons/cross-icon.svg";
 import { getAssociatedTenants } from "../../api";
-import { TenantInfo, TenantRequestResponse } from "../../models";
+import { TenantInfo, TenantRequestResponse, EnvironmentInfo, EnvironmentRequestResponse } from "../../models";
 import { AddTenantWizard } from "../add-modal";
 
 /**
@@ -74,23 +74,33 @@ const TenantSwitchDropdown: FunctionComponent<TenantSwitchDropdownInterface> = (
     const getOrganizationList:  () => Promise<void> = useCallback(async () => {
         setIsOrganizationsLoading(true);
         getAssociatedTenants()
-            .then((response: TenantRequestResponse) => {
+            .then((response: EnvironmentRequestResponse []) => {
                 const tenants: OrganizationInterface[] = [];
+                let defaultDomain: string = "";
+                const associatedTenants: TenantInfo[] = [];
 
-                response.associatedTenants.forEach((tenant: TenantInfo) => {
-                    if (window[ "AppUtils" ].getConfig().tenant === tenant.domain) {
-                        return;
-                    }
+                response.forEach((environmentRequestResponse: EnvironmentRequestResponse) => {
+                    environmentRequestResponse.environments.forEach((environment: EnvironmentInfo) => {
+                    if (environment.isDefault) {
+                                                defaultDomain = environmentRequestResponse.orgName;
+                                            }
+                    });
 
                     tenants.push({
-                        id: tenant.id,
-                        name: tenant.domain,
-                        ref: tenant.id,
-                        status: "ACTIVE"
+                        id: environmentRequestResponse.orgUUID,
+                                                name: environmentRequestResponse.orgName,
+                                                ref: environmentRequestResponse.orgUUID,
+                                                status: "ACTIVE"
+                    });
+                    associatedTenants.push({
+                                            id: environmentRequestResponse.orgUUID,
+                                            domain: environmentRequestResponse.orgName,
+                                            default: defaultDomain == environmentRequestResponse.orgName,
+                                            associationType: "Member"
                     });
                 });
 
-                dispatch(setTenants<TenantInfo>(response.associatedTenants));
+                dispatch(setTenants<TenantInfo>(associatedTenants));
                 setAssociatedOrganizations(tenants);
                 setFilteredOrganizations(tenants);
             })
diff --git a/apps/console/src/extensions/components/tenants/components/forms/add-tenant-wizard-form.tsx b/apps/console/src/extensions/components/tenants/components/forms/add-tenant-wizard-form.tsx
index a9c5ece0fd6..50d2fb2f7ed 100644
--- a/apps/console/src/extensions/components/tenants/components/forms/add-tenant-wizard-form.tsx
+++ b/apps/console/src/extensions/components/tenants/components/forms/add-tenant-wizard-form.tsx
@@ -29,14 +29,22 @@ import React, {
     ReactElement,
     SetStateAction,
     useCallback,
+    useEffect,
     useState
 } from "react";
 import { Trans, useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
 import { Divider, Segment } from "semantic-ui-react";
 import { AppState } from "../../../../../features/core/store";
-import { checkDuplicateTenants } from "../../api";
+import { addNewTenant, checkDuplicateTenants, getDeployments } from "../../api";
 import { TenantManagementConstants } from "../../constants";
+import {
+    ORGANIZATION_DESCRIPTION_MAX_LENGTH,
+    ORGANIZATION_DESCRIPTION_MIN_LENGTH
+} from "../../../../../features/organizations/constants";
+import delay from "lodash-es/delay";
+import {handleTenantSwitch} from "../../utils";
+import {DropdownOptionsInterface} from "../../../../../features/applications/components/settings";
 
 /**
  * Interface to capture add tenant wizard form props.
@@ -62,6 +70,7 @@ export interface AddTenantWizardFormErrorValidationsInterface {
  */
 export interface AddTenantWizardFormValuesInterface {
     tenantName: string;
+    deploymentUUID: string;
 }
 
 const FORM_ID: string = "add-tenant-wizard-form";
@@ -98,6 +107,10 @@ export const AddTenantWizardForm: FunctionComponent<AddTenantWizardFormPropsInte
         return state.config?.deployment?.tenantPrefix as string;
     });
 
+    const [ selectedRegion, setSelectedRegionValue ] = useState<string>();
+    const [ deployments, setDeployments ] = useState<DropdownOptionsInterface[]>();
+    const [ deploymentsLoading, setDeploymentsLoading ] = useState(false);
+
     const { t } = useTranslation();
 
     const checkTenantValidity = (tenantName: string): boolean => {
@@ -153,6 +166,30 @@ export const AddTenantWizardForm: FunctionComponent<AddTenantWizardFormPropsInte
         }
     };
 
+    const getDeploymentNames = (): void => {
+            const deployments: DropdownOptionsInterface[] = [];
+            getDeployments().then((response: AxiosResponse) => {
+                if (response.status == 200) {
+                    response.data.map((dep) => {
+                        if (dep.isPublic) {
+                            deployments.push({
+                                key: dep.deploymentName,
+                                text: dep.displayName,
+                                value: dep.deploymentUUID
+                            });
+                        }
+                    });
+                }
+            });
+            setDeployments(deployments);
+            setDeploymentsLoading(false);
+            setSelectedRegionValue(deployments.length && deployments[0].value);
+        };
+
+        useEffect(() => {
+            getDeploymentNames();
+        }, []);
+
     /**
      * Validate input data.
      *
@@ -349,6 +386,21 @@ export const AddTenantWizardForm: FunctionComponent<AddTenantWizardFormPropsInte
                     width={ 16 }
                     data-testid={ `${ testId }-type-input` }
                 />
+                {!deploymentsLoading && (
+                                    <Field.Dropdown
+                                        ariaLabel="region"
+                                        inputType="default"
+                                        name="deploymentUUID"
+                                        label="Region"
+                                        required={true}
+                                        placeholder="Select a region"
+                                        value={selectedRegion}
+                                        options={deployments}
+                                        data-componentid={`${testId}-region-input`}
+                                        listen={(value: string) => setSelectedRegionValue(value)}
+                                        width={16}
+                                    />
+                                )}
             </Form>
             <Divider className="mt-1" hidden />
             { isCheckingTenantExistence ? (
diff --git a/apps/console/src/extensions/components/tenants/models/environment.ts b/apps/console/src/extensions/components/tenants/models/environment.ts
new file mode 100644
index 00000000000..cd1e7b85f77
--- /dev/null
+++ b/apps/console/src/extensions/components/tenants/models/environment.ts
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com). All Rights Reserved.
+ *
+ * This software is the property of WSO2 Inc. and its suppliers, if any.
+ * Dissemination of any information or reproduction of any material contained
+ * herein in any form is strictly forbidden, unless permitted by WSO2 expressly.
+ * You may not alter or remove any copyright or other notice from copies of this content."
+ */
+
+
+export interface Environment {
+    organizationName: string;
+    environmentName: string;
+}
+
+/**
+ *  Interface of a environment.
+ */
+export interface EnvironmentInfo {
+    envName: string;
+    envUUID: string;
+    deploymentName: string;
+    deploymentUUID: string;
+    b2bOrgUUID: string;
+    tenantUUID: string;
+    associationType: string;
+    isDefault: boolean;
+}
+
+/**
+ * Interface for the response returned by the get associated environments request.
+ */
+export interface EnvironmentRequestResponse {
+    orgName: string;
+    orgUUID: string;
+    environments: EnvironmentInfo[];
+}
+
+
diff --git a/apps/console/src/extensions/components/tenants/models/index.ts b/apps/console/src/extensions/components/tenants/models/index.ts
index 066cf7e3703..68abe780115 100644
--- a/apps/console/src/extensions/components/tenants/models/index.ts
+++ b/apps/console/src/extensions/components/tenants/models/index.ts
@@ -18,3 +18,4 @@
 
 export * from "./tenant";
 export * from "./endpoints";
+export * from "./environment"
diff --git a/apps/console/src/extensions/components/tenants/pages/create-tenant.tsx b/apps/console/src/extensions/components/tenants/pages/create-tenant.tsx
index b31275ad610..d8067811b4a 100644
--- a/apps/console/src/extensions/components/tenants/pages/create-tenant.tsx
+++ b/apps/console/src/extensions/components/tenants/pages/create-tenant.tsx
@@ -68,6 +68,7 @@ export interface AddTenantFormErrorValidationsInterface {
  */
 export interface AddTenantFormValuesInterface {
     tenantName: string;
+    deploymentUuid: string;
 }
 
 const FORM_ID: string = "create-tenant-form";
@@ -121,7 +122,7 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
     }, [ deploymentRegion ]);
 
     /**
-     * Generate alternative console url base path based on the 
+     * Generate alternative console url base path based on the
      * current deployment region and url pattern.
      * Alternative region will be the inverse of the current region.
      */
@@ -137,24 +138,24 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
 
             if (regionQualifiedConsoleUrl.includes("asgardeo.io")) {
                 const position: number = regionQualifiedConsoleUrl.indexOf("asgardeo.io");
-                
+
                 return [
-                    regionQualifiedConsoleUrl.slice(0, position), 
-                    `${Region.EU.toLowerCase()}.`, 
+                    regionQualifiedConsoleUrl.slice(0, position),
+                    `${Region.EU.toLowerCase()}.`,
                     regionQualifiedConsoleUrl.slice(position)
                 ].join("");
             } else if (regionQualifiedConsoleUrl.includes("asg.io")) {
                 const position: number = regionQualifiedConsoleUrl.indexOf("asg.io");
-                
+
                 return [
-                    regionQualifiedConsoleUrl.slice(0, position), 
-                    `${Region.EU.toLowerCase()}.`, 
+                    regionQualifiedConsoleUrl.slice(0, position),
+                    `${Region.EU.toLowerCase()}.`,
                     regionQualifiedConsoleUrl.slice(position)
                 ].join("");
             } else {
                 return TenantManagementConstants.EU_PROD_CONSOLE_FALLBACK_URL;
             }
-            
+
         } else {
             if (regionQualifiedConsoleUrl.includes("."+Region.EU.toLowerCase())) {
                 return regionQualifiedConsoleUrl.replace(/.eu/g,"");
@@ -250,7 +251,7 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
             .catch((error: AxiosError) => {
                 if (error.response.status == 404) {
                     // Proceed to tenant creation if tenant does not exist.
-                    addTenant(submissionValue.tenantName);
+                    addTenant(submissionValue.tenantName, submissionValue.deploymentUuid);
                 } else {
                     setIsNewTenantLoading(false);
                     setAlert({
@@ -266,10 +267,10 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
     /**
      * Function which contains the logic to add a new tenant by calling APIs.
      */
-    const addTenant = (tenantName: string): void => {
+    const addTenant = (tenantName: string, deploymentUuid: string): void => {
         setIsNewTenantLoading(true);
         setTenantLoaderText(t("extensions:manage.features.tenant.wizards.addTenant.forms.loaderMessages.tenantCreate"));
-        addNewTenant(tenantName)
+        addNewTenant(tenantName, deploymentUuid)
             .then((response: AxiosResponse) => {
                 if (response.status === 201) {
                     eventPublisher.publish("create-new-organization");
@@ -460,8 +461,8 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
                                                 "tenantCreationPrompt.subHeading1") }
                                         </Text>
                                         <Text display="inline">
-                                            <Flag 
-                                                name={ String(deploymentRegion)?.toLowerCase() as FlagNameValues } 
+                                            <Flag
+                                                name={ String(deploymentRegion)?.toLowerCase() as FlagNameValues }
                                             />
                                             { deploymentRegion }
                                             { " " }
@@ -489,8 +490,8 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
                                         <Text muted display="inline">{ t("extensions:manage.features.tenant." +
                                                 "tenantCreationPrompt.subHeading6") }</Text>
                                         <Text display="inline">
-                                            <Flag 
-                                                name={ String(alternativeRegion)?.toLowerCase() as FlagNameValues } 
+                                            <Flag
+                                                name={ String(alternativeRegion)?.toLowerCase() as FlagNameValues }
                                             />
                                             { alternativeRegion }
                                             { " " }
@@ -550,13 +551,13 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
                             { isCheckingTenantExistence
                                 ? (
                                     <Text className="tenant-uri-prefix">
-                                        { `${regionQualifiedConsoleUrl ?? 
+                                        { `${regionQualifiedConsoleUrl ??
                                             "https://console.asgardeo.io"}/${tenantPrefix ?? "t"}/` }
                                         <Icon name="circle notched" color="grey" loading/>
                                     </Text>
                                 ) : (
                                     <span>
-                                        { `${regionQualifiedConsoleUrl ?? 
+                                        { `${regionQualifiedConsoleUrl ??
                                             "https://console.asgardeo.io"}/${tenantPrefix ?? "t"}/` }
                                         <span
                                             className={ `${
diff --git a/apps/console/src/features/authentication/hooks/use-sign-in.ts b/apps/console/src/features/authentication/hooks/use-sign-in.ts
index c3f0b367289..398b27a7dbe 100644
--- a/apps/console/src/features/authentication/hooks/use-sign-in.ts
+++ b/apps/console/src/features/authentication/hooks/use-sign-in.ts
@@ -73,6 +73,8 @@ export type UseSignInInterface = {
         onTenantResolve: (tenantDomain: string) => void,
         onSignInSuccessRedirect: (idToken: DecodedIDTokenPayload) => void,
         onAppReady: () => void,
+        isPrivilegedUser: boolean,
+        associatedTenants?: string[],
     ) => Promise<void>;
 };
 
@@ -180,16 +182,15 @@ const useSignIn = (): UseSignInInterface => {
         response: BasicUserInfo,
         onTenantResolve: (tenantDomain: string) => void,
         onSignInSuccessRedirect: (idToken: DecodedIDTokenPayload) => void,
-        onAppReady: () => void
+        onAppReady: () => void,
+        isPrivilegedUser: boolean,
+        associatedTenants?: string[]
     ): Promise<void> => {
         let logoutUrl: string;
         let logoutRedirectUrl: string;
 
         const idToken: DecodedIDTokenPayload = await getDecodedIDToken();
-        const isPrivilegedUser: boolean =
-            idToken?.amr?.length > 0
-                ? idToken?.amr[0] === "EnterpriseIDPAuthenticator"
-                : false;
+
         const event: Event = new Event(CommonConstantsCore.AUTHENTICATION_SUCCESSFUL_EVENT);
 
         dispatchEvent(event);
@@ -217,8 +218,10 @@ const useSignIn = (): UseSignInInterface => {
                         response,
                         transformTenantDomain(response.orgName)
                     ), {
-                        associatedTenants: isPrivilegedUser ? tenantDomain : idToken?.associated_tenants,
-                        defaultTenant: isPrivilegedUser ? tenantDomain : idToken?.default_tenant,
+                        associatedTenants: associatedTenants !== undefined && associatedTenants.length !== 0
+                            ? associatedTenants : isPrivilegedUser ? tenantDomain : idToken?.associated_tenants,
+                        defaultTenant: associatedTenants !== undefined && associatedTenants.length !== 0
+                        ? tenantDomain : isPrivilegedUser ? tenantDomain : idToken?.default_tenant,
                         fullName: fullName,
                         isPrivilegedUser: isPrivilegedUser
                     })
diff --git a/apps/console/src/features/authentication/utils/authenticate-utils.ts b/apps/console/src/features/authentication/utils/authenticate-utils.ts
index f176328691c..e6fdf9ef247 100644
--- a/apps/console/src/features/authentication/utils/authenticate-utils.ts
+++ b/apps/console/src/features/authentication/utils/authenticate-utils.ts
@@ -78,6 +78,38 @@ export class AuthenticateUtils {
         };
     };
 
+    public static getInitializeCentralConfig = (): AuthReactConfig => {
+
+            return {
+                baseUrl: window["AppUtils"]?.getCentralConfig()?.centralServerOrigin ??
+                    window[ "AppUtils" ]?.getCentralConfig()?.centralServerOrigin,
+                checkSessionInterval: window[ "AppUtils" ]?.getCentralConfig()?.session?.checkSessionInterval,
+                clientHost: window["AppUtils"]?.getCentralConfig()?.clientOriginWithTenant,
+                clientID: window["AppUtils"]?.getCentralConfig()?.clientID,
+                clockTolerance: window[ "AppUtils" ]?.getCentralConfig().idpConfigs?.clockTolerance,
+                disableTrySignInSilently: new URL(location.href).searchParams.get("disable_silent_sign_in") === "true",
+                enableOIDCSessionManagement: window["AppUtils"]?.getCentralConfig().idpConfigs?.enableOIDCSessionManagement
+                    ?? false,
+                enablePKCE: window["AppUtils"]?.getCentralConfig()?.idpConfigs?.enablePKCE ?? true,
+                endpoints: {
+                    authorizationEndpoint: window["AppUtils"]?.getCentralConfig()?.idpConfigs?.authorizeEndpointURL,
+                    checkSessionIframe: window["AppUtils"]?.getCentralConfig()?.idpConfigs?.oidcSessionIFrameEndpointURL,
+                    endSessionEndpoint: window["AppUtils"]?.getCentralConfig()?.idpConfigs?.logoutEndpointURL,
+                    jwksUri: window["AppUtils"]?.getCentralConfig()?.idpConfigs?.jwksEndpointURL,
+                    revocationEndpoint: window["AppUtils"]?.getCentralConfig()?.idpConfigs?.tokenRevocationEndpointURL,
+                    tokenEndpoint: window["AppUtils"]?.getCentralConfig()?.idpConfigs?.tokenEndpointURL
+                },
+                resourceServerURLs: AuthenticateUtils.resolveBaseUrls(),
+                responseMode: window["AppUtils"]?.getCentralConfig()?.idpConfigs?.responseMode ?? responseModeFallback,
+                scope: window["AppUtils"]?.getCentralConfig()?.idpConfigs?.scope ?? [ TokenConstants.SYSTEM_SCOPE ],
+                sendCookiesInRequests: true,
+                sessionRefreshInterval: window[ "AppUtils" ]?.getCentralConfig()?.session?.sessionRefreshTimeOut,
+                signInRedirectURL: window["AppUtils"]?.getCentralConfig()?.loginCallbackURL,
+                signOutRedirectURL: window["AppUtils"]?.getCentralConfig()?.loginCallbackURL,
+                storage: AuthenticateUtils.resolveStorage() as Storage.SessionStorage
+            };
+        };
+
     /**
      * Determines what storage type should be used to store session information.
      *
@@ -112,17 +144,21 @@ export class AuthenticateUtils {
     public static resolveBaseUrls(): string[] {
         let baseUrls: string[] = window["AppUtils"]?.getConfig()?.idpConfigs?.baseUrls;
         const serverOrigin: string = window["AppUtils"]?.getConfig()?.serverOrigin;
+        const centralServerOrigin: string = window["AppUtils"]?.getConfig()?.centralServerOrigin;
 
         if (baseUrls) {
             // If the server origin is not specified in the overridden config, append it.
             if (!baseUrls.includes(serverOrigin)) {
                 baseUrls = [ ...baseUrls, serverOrigin ];
             }
+            if (!baseUrls.includes(centralServerOrigin)) {
+                            baseUrls = [ ...baseUrls, centralServerOrigin ];
+                        }
 
             return baseUrls;
         }
 
-        return [ serverOrigin ];
+        return [ serverOrigin, centralServerOrigin ];
     }
 
     /**
diff --git a/apps/console/src/features/core/configs/app.ts b/apps/console/src/features/core/configs/app.ts
index 55d8a8023a6..d0b4fabe311 100644
--- a/apps/console/src/features/core/configs/app.ts
+++ b/apps/console/src/features/core/configs/app.ts
@@ -117,6 +117,8 @@ export class Config {
             adminApp: window[ "AppUtils" ]?.getConfig()?.adminApp,
             allowMultipleAppProtocols: window[ "AppUtils" ]?.getConfig()?.allowMultipleAppProtocols,
             appBaseName: window[ "AppUtils" ]?.getConfig()?.appBaseWithTenant,
+            isRegionalConsole: window[ "AppUtils" ]?.getConfig()?.isRegionalConsole,
+            centralServerOrigin: window[ "AppUtils" ]?.getConfig()?.centralServerOrigin,
             appBaseNameWithoutTenant: window[ "AppUtils" ]?.getConfig()?.appBase,
             appHomePath: window[ "AppUtils" ]?.getConfig()?.routes?.home,
             appLoginPath: window[ "AppUtils" ]?.getConfig()?.routes?.login,
diff --git a/apps/console/src/features/core/models/config.ts b/apps/console/src/features/core/models/config.ts
index 2a2c3e8bd15..4988a02936f 100644
--- a/apps/console/src/features/core/models/config.ts
+++ b/apps/console/src/features/core/models/config.ts
@@ -243,6 +243,7 @@ export interface DeploymentConfigInterface extends CommonDeploymentConfigInterfa
      * Configs of the myaccount app.
      */
     accountApp: ExternalAppConfigInterface;
+    centralServerOrigin: string;
     /**
      * Configs of the developer app.
      */
@@ -263,6 +264,7 @@ export interface DeploymentConfigInterface extends CommonDeploymentConfigInterfa
      * Configs of multiple application protocol.
      */
     allowMultipleAppProtocols?: boolean;
+    isRegionalConsole? : boolean;
 }
 
 /**
diff --git a/apps/console/src/features/core/models/reducer-state.ts b/apps/console/src/features/core/models/reducer-state.ts
index a1442c5620b..17835ec5366 100644
--- a/apps/console/src/features/core/models/reducer-state.ts
+++ b/apps/console/src/features/core/models/reducer-state.ts
@@ -36,6 +36,7 @@ import { PortalDocumentationStructureInterface } from "./help-panel";
 import { AppViewTypes } from "./ui";
 import { OrganizationType } from "../../organizations/constants";
 import { OrganizationResponseInterface } from "../../organizations/models";
+import {EnvironmentInfo} from "../../../extensions/components/tenants/models";
 
 /**
  * Portal config reducer state interface.
@@ -76,7 +77,7 @@ export interface AccessControlReducerStateInterface {
 /**
  * Organization Reducer State Interface.
  */
-export interface OrganizationReducerStateInterface { 
+export interface OrganizationReducerStateInterface {
     superAdmin: string;
     currentOrganization: string;
     organization?: OrganizationResponseInterface;
@@ -86,6 +87,11 @@ export interface OrganizationReducerStateInterface {
     userOrganizationId: string;
 }
 
+export interface EnvironmentReducerStateInterface {
+    currentEnvironment: EnvironmentInfo;
+    loggedInUserId?: string;
+}
+
 export interface RoutesReducerStateInterface {
     manageRoutes: {
         filteredRoutes: RouteInterface[];
diff --git a/apps/console/src/features/core/store/actions/environment.ts b/apps/console/src/features/core/store/actions/environment.ts
new file mode 100644
index 00000000000..b0cf7d3653a
--- /dev/null
+++ b/apps/console/src/features/core/store/actions/environment.ts
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import {EnvironmentActionTypes, SetCurrentEnvironmentActionInterface, SetLoggedInUserIdActionInterface} from "./types/enviroment";
+import {EnvironmentInfo} from "../../../../extensions/components/tenants/models";
+
+/**
+ * Redux action to set the current environment.
+ *
+ * @param environment
+ */
+export const setCurrentEnvironment = (environment: EnvironmentInfo): SetCurrentEnvironmentActionInterface => {
+    return {
+        payload: environment,
+        type: EnvironmentActionTypes.SET_CURRENT_ENVIRONMENT
+    };
+};
+
+export const setLoggedInUserId = (userId: string): SetLoggedInUserIdActionInterface => {
+    return {
+        payload: userId,
+        type: EnvironmentActionTypes.SET_LOGGED_IN_USER_ID
+    };
+};
diff --git a/apps/console/src/features/core/store/actions/types/enviroment.ts b/apps/console/src/features/core/store/actions/types/enviroment.ts
new file mode 100644
index 00000000000..c84c7b38cc0
--- /dev/null
+++ b/apps/console/src/features/core/store/actions/types/enviroment.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { EnvironmentInfo } from "../../../../../extensions/components/tenants/models";
+
+export enum EnvironmentActionTypes {
+    SET_CURRENT_ENVIRONMENT = "SET_CURRENT_ENVIRONMENT",
+    SET_LOGGED_IN_USER_ID = "SET_LOGGED_IN_USER_ID"
+}
+
+export interface SetCurrentEnvironmentActionInterface {
+    payload: EnvironmentInfo;
+    type: EnvironmentActionTypes.SET_CURRENT_ENVIRONMENT;
+}
+
+export interface SetLoggedInUserIdActionInterface {
+    payload: string;
+    type: EnvironmentActionTypes.SET_LOGGED_IN_USER_ID;
+}
+
+export type EnvironmentAction =
+    | SetCurrentEnvironmentActionInterface | SetLoggedInUserIdActionInterface;
diff --git a/apps/console/src/features/core/store/reducers/config.ts b/apps/console/src/features/core/store/reducers/config.ts
index 91e9d8fd414..ba50637f730 100644
--- a/apps/console/src/features/core/store/reducers/config.ts
+++ b/apps/console/src/features/core/store/reducers/config.ts
@@ -54,6 +54,7 @@ export const commonConfigReducerInitialState: CommonConfigReducerStateInterface<
             appHomePath: "",
             appLoginPath: "",
             appLogoutPath: "",
+            centralServerOrigin: "",
             clientHost: "",
             clientID: "",
             clientOrigin: "",
diff --git a/apps/console/src/features/core/store/reducers/environment.ts b/apps/console/src/features/core/store/reducers/environment.ts
new file mode 100644
index 00000000000..67f8dba24b1
--- /dev/null
+++ b/apps/console/src/features/core/store/reducers/environment.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2022, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { EnvironmentReducerStateInterface } from "../../models";
+import { EnvironmentAction, EnvironmentActionTypes } from "../actions/types/enviroment";
+
+const initialState: EnvironmentReducerStateInterface = {
+    currentEnvironment: {
+        envName: null,
+        envUUID: null,
+        deploymentName: null,
+        deploymentUUID: null,
+        b2bOrgUUID: null,
+        tenantUUID: null,
+        associationType: null,
+        isDefault: false
+    },
+    loggedInUserId: null,
+};
+
+export const environmentReducer = (
+    state: EnvironmentReducerStateInterface = initialState,
+    action: EnvironmentAction
+): EnvironmentReducerStateInterface => {
+    switch (action.type) {
+        case EnvironmentActionTypes.SET_CURRENT_ENVIRONMENT:
+            return {
+                ...state,
+                currentEnvironment: action.payload
+            };
+        case EnvironmentActionTypes.SET_LOGGED_IN_USER_ID:
+            return {
+                ...state,
+                loggedInUserId: action.payload
+            };
+        default:
+            return {
+                ...state
+            };
+    }
+};
diff --git a/apps/console/src/features/organizations/components/organization-list.tsx b/apps/console/src/features/organizations/components/organization-list.tsx
index 9eeea0e1d99..3c8b4a80d58 100644
--- a/apps/console/src/features/organizations/components/organization-list.tsx
+++ b/apps/console/src/features/organizations/components/organization-list.tsx
@@ -298,7 +298,7 @@ export const OrganizationList: FunctionComponent<OrganizationListPropsInterface>
 
         try {
             response = await switchOrganization(organization.id);
-            await onSignIn(response, () => null, () => null, () => null);
+            await onSignIn(response, () => null, () => null, () => null, false);
 
             onListMutate();
             mutateOrganizationBreadCrumbFetchRequest();
diff --git a/apps/console/src/features/organizations/components/organization-switch/organization-switch-breadcrumb.tsx b/apps/console/src/features/organizations/components/organization-switch/organization-switch-breadcrumb.tsx
index 7f9a381fcfe..0bca81fa692 100644
--- a/apps/console/src/features/organizations/components/organization-switch/organization-switch-breadcrumb.tsx
+++ b/apps/console/src/features/organizations/components/organization-switch/organization-switch-breadcrumb.tsx
@@ -212,7 +212,8 @@ export const OrganizationSwitchBreadcrumb: FunctionComponent<OrganizationSwitchD
                         window["AppUtils"].updateOrganizationName("");
                     }
                 },
-                () => null
+                () => null,
+                false
             );
 
             mutateOrganizationBreadCrumbFetchRequest();
diff --git a/apps/console/src/features/organizations/pages/organization-edit.tsx b/apps/console/src/features/organizations/pages/organization-edit.tsx
index 623ef61865d..7eac591fa18 100644
--- a/apps/console/src/features/organizations/pages/organization-edit.tsx
+++ b/apps/console/src/features/organizations/pages/organization-edit.tsx
@@ -199,8 +199,8 @@ const OrganizationEditPage: FunctionComponent<OrganizationEditPagePropsInterface
 
         try {
             response = await switchOrganization(organization.id);
-            await onSignIn(response, () => null, () => null, () => null);
-            await mutateOrganizationBreadCrumbFetchRequest();
+            await onSignIn(response, () => null, () => null, () => null, false);
+            //await mutateOrganizationBreadCrumbFetchRequest();
 
             history.push(AppConstants.getPaths().get("GETTING_STARTED"));
         } catch(e) {
diff --git a/apps/console/src/features/tenants/api/tenants.ts b/apps/console/src/features/tenants/api/tenants.ts
index 23947bdac07..3697a1b792f 100644
--- a/apps/console/src/features/tenants/api/tenants.ts
+++ b/apps/console/src/features/tenants/api/tenants.ts
@@ -29,12 +29,24 @@ const getDomainQueryParam = (): string => {
     return `?domain=${ tenantDomain }`;
 };
 
+const getUsernameQueryParam = (): string => {
+    const username: string = store.getState()?.auth?.username;
+
+    return `&userUUID=${ username }`;
+};
+
 const isPrivilegedUser = (): boolean => {
     const isPrivileged: boolean = store.getState()?.auth?.isPrivilegedUser ?? false;
 
     return isPrivileged;
 };
 
+const getUserIdQueryParam = (): string => {
+    const userId: string = store.getState()?.environment?.loggedInUserId;
+    console.log("calling the feature user id")
+    return `&userId=${ userId }`;
+};
+
 /**
  * Initialize an axios Http client.
  */
@@ -47,17 +59,20 @@ const httpClient: HttpClientInstance = AsgardeoSPAClient.getInstance()
  *
  * @param tenantName - new tenant name
  */
-export const addNewTenant = (tenantName: string): Promise<AxiosResponse> => {
+export const addNewTenant = (tenantName: string, deploymentUUID: string): Promise<AxiosResponse> => {
     const requestConfig: AxiosRequestConfig = {
         data: {
-            domain: tenantName
+            "orgName": tenantName,
+            "defaultEnvName": "prod",
+            "deploymentUUIDForDefaultEnv": deploymentUUID,
+            "isDefault": false
         },
         headers: {
             "Access-Control-Allow-Origin": store.getState().config.deployment.clientOrigin,
             "Content-Type": "application/json"
         },
         method: HttpMethods.POST,
-        url: store.getState().config.endpoints.tenantManagementApi + getDomainQueryParam()
+        url: store.getState().config.endpoints.tenantManagementApi + "/organization" + getDomainQueryParam()
     };
 
     return httpClient(requestConfig)
@@ -103,7 +118,8 @@ export const checkDuplicateTenants = (tenantName: string): Promise<AxiosResponse
             "Access-Control-Allow-Origin": store.getState().config.deployment.clientOrigin
         },
         method: HttpMethods.HEAD,
-        url: store.getState().config.endpoints.tenantManagementApi + "/" + tenantName + getDomainQueryParam()
+        url: store.getState().config.endpoints.tenantManagementApi + "/organization/check-org" + getDomainQueryParam() +
+        "&orgName=" + tenantName + getUsernameQueryParam()
     };
 
     return httpClient(requestConfig)
@@ -136,7 +152,7 @@ export const getAssociatedTenants = (): Promise<TenantRequestResponse> => {
 
     const requestConfig: AxiosRequestConfig = {
         method: HttpMethods.GET,
-        url: store.getState().config.endpoints.tenantAssociationApi + getDomainQueryParam()
+        url: store.getState().config.endpoints.tenantManagementApi + "/user-association/user/me" + getDomainQueryParam() + getUserIdQueryParam()
     };
 
     return httpClient(requestConfig)
@@ -147,3 +163,21 @@ export const getAssociatedTenants = (): Promise<TenantRequestResponse> => {
             return Promise.reject(error?.response?.data);
         });
 };
+
+/**
+ * Get the deployments associated with the current user.
+ */
+export const getDeployments = (): Promise<AxiosResponse> => {
+
+    const requestConfig: AxiosRequestConfig = {
+        url: store.getState().config.endpoints.tenantManagementApi + "/deployment" + getDomainQueryParam()
+    };
+
+    return httpClient(requestConfig)
+        .then((response: AxiosResponse) => {
+            return Promise.resolve(response);
+        })
+        .catch((error: AxiosError) => {
+            return Promise.reject(error?.response?.data);
+        });
+};
diff --git a/apps/console/src/features/tenants/components/add-modal/add-tenant.tsx b/apps/console/src/features/tenants/components/add-modal/add-tenant.tsx
index 91f0a58c040..f8afebfd320 100644
--- a/apps/console/src/features/tenants/components/add-modal/add-tenant.tsx
+++ b/apps/console/src/features/tenants/components/add-modal/add-tenant.tsx
@@ -99,7 +99,7 @@ export const AddTenantWizard: FunctionComponent<AddTenantWizardPropsInterface> =
             .catch((error: AxiosError) => {
                 if (error.response.status == 404) {
                     // Proceed to tenant creation if tenant does not exist.
-                    addTenant(submissionValue.tenantName);
+                    addTenant(submissionValue.tenantName, submissionValue.deploymentUuid);
                 } else {
                     setIsNewTenantLoading(false);
                     setAlert({
@@ -140,10 +140,10 @@ export const AddTenantWizard: FunctionComponent<AddTenantWizardPropsInterface> =
         title: t("extensions:manage.features.tenant.wizards.addTenant.heading")
     } ];
 
-    const addTenant = (tenantName: string): void => {
+    const addTenant = (tenantName: string, deploymentUuid: string): void => {
         setIsNewTenantLoading(true);
         setTenantLoaderText(t("extensions:manage.features.tenant.wizards.addTenant.forms.loaderMessages.tenantCreate"));
-        addNewTenant(tenantName)
+        addNewTenant(tenantName, deploymentUuid)
             .then((response: AxiosResponse) => {
                 if (response.status === 201) {
                     eventPublisher.publish("create-new-organization");
diff --git a/apps/console/src/features/tenants/components/forms/add-tenant-wizard-form.tsx b/apps/console/src/features/tenants/components/forms/add-tenant-wizard-form.tsx
index e40270851b0..909dbaf0013 100644
--- a/apps/console/src/features/tenants/components/forms/add-tenant-wizard-form.tsx
+++ b/apps/console/src/features/tenants/components/forms/add-tenant-wizard-form.tsx
@@ -62,6 +62,7 @@ export interface AddTenantWizardFormErrorValidationsInterface {
  */
 export interface AddTenantWizardFormValuesInterface {
     tenantName: string;
+    deploymentUuid: string;
 }
 
 const FORM_ID: string = "add-tenant-wizard-form";
diff --git a/apps/console/src/features/tenants/pages/create-tenant.tsx b/apps/console/src/features/tenants/pages/create-tenant.tsx
index 4dbb9544459..636d065e224 100644
--- a/apps/console/src/features/tenants/pages/create-tenant.tsx
+++ b/apps/console/src/features/tenants/pages/create-tenant.tsx
@@ -68,6 +68,7 @@ export interface AddTenantFormErrorValidationsInterface {
  */
 export interface AddTenantFormValuesInterface {
     tenantName: string;
+    deploymentUUID: string;
 }
 
 const FORM_ID: string = "create-tenant-form";
@@ -121,7 +122,7 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
     }, [ deploymentRegion ]);
 
     /**
-     * Generate alternative console url base path based on the 
+     * Generate alternative console url base path based on the
      * current deployment region and url pattern.
      * Alternative region will be the inverse of the current region.
      */
@@ -137,24 +138,24 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
 
             if (regionQualifiedConsoleUrl.includes("asgardeo.io")) {
                 const position: number = regionQualifiedConsoleUrl.indexOf("asgardeo.io");
-                
+
                 return [
-                    regionQualifiedConsoleUrl.slice(0, position), 
-                    `${Region.EU.toLowerCase()}.`, 
+                    regionQualifiedConsoleUrl.slice(0, position),
+                    `${Region.EU.toLowerCase()}.`,
                     regionQualifiedConsoleUrl.slice(position)
                 ].join("");
             } else if (regionQualifiedConsoleUrl.includes("asg.io")) {
                 const position: number = regionQualifiedConsoleUrl.indexOf("asg.io");
-                
+
                 return [
-                    regionQualifiedConsoleUrl.slice(0, position), 
-                    `${Region.EU.toLowerCase()}.`, 
+                    regionQualifiedConsoleUrl.slice(0, position),
+                    `${Region.EU.toLowerCase()}.`,
                     regionQualifiedConsoleUrl.slice(position)
                 ].join("");
             } else {
                 return TenantManagementConstants.EU_PROD_CONSOLE_FALLBACK_URL;
             }
-            
+
         } else {
             if (regionQualifiedConsoleUrl.includes("."+Region.EU.toLowerCase())) {
                 return regionQualifiedConsoleUrl.replace(/.eu/g,"");
@@ -250,7 +251,7 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
             .catch((error: AxiosError) => {
                 if (error.response.status == 404) {
                     // Proceed to tenant creation if tenant does not exist.
-                    addTenant(submissionValue.tenantName);
+                    addTenant(submissionValue.tenantName, submissionValue.deploymentUUID);
                 } else {
                     setIsNewTenantLoading(false);
                     setAlert({
@@ -266,10 +267,10 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
     /**
      * Function which contains the logic to add a new tenant by calling APIs.
      */
-    const addTenant = (tenantName: string): void => {
+    const addTenant = (tenantName: string, deploymentUUID: string): void => {
         setIsNewTenantLoading(true);
         setTenantLoaderText(t("extensions:manage.features.tenant.wizards.addTenant.forms.loaderMessages.tenantCreate"));
-        addNewTenant(tenantName)
+        addNewTenant(tenantName, deploymentUUID)
             .then((response: AxiosResponse) => {
                 if (response.status === 201) {
                     eventPublisher.publish("create-new-organization");
@@ -460,8 +461,8 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
                                                 "tenantCreationPrompt.subHeading1") }
                                         </Text>
                                         <Text display="inline">
-                                            <Flag 
-                                                name={ String(deploymentRegion)?.toLowerCase() as FlagNameValues } 
+                                            <Flag
+                                                name={ String(deploymentRegion)?.toLowerCase() as FlagNameValues }
                                             />
                                             { deploymentRegion }
                                             { " " }
@@ -489,8 +490,8 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
                                         <Text muted display="inline">{ t("extensions:manage.features.tenant." +
                                                 "tenantCreationPrompt.subHeading6") }</Text>
                                         <Text display="inline">
-                                            <Flag 
-                                                name={ String(alternativeRegion)?.toLowerCase() as FlagNameValues } 
+                                            <Flag
+                                                name={ String(alternativeRegion)?.toLowerCase() as FlagNameValues }
                                             />
                                             { alternativeRegion }
                                             { " " }
@@ -550,13 +551,13 @@ const TenantCreationPage: FunctionComponent<TestableComponentInterface> = (
                             { isCheckingTenantExistence
                                 ? (
                                     <Text className="tenant-uri-prefix">
-                                        { `${regionQualifiedConsoleUrl ?? 
+                                        { `${regionQualifiedConsoleUrl ??
                                             "https://console.asgardeo.io"}/${tenantPrefix ?? "t"}/` }
                                         <Icon name="circle notched" color="grey" loading/>
                                     </Text>
                                 ) : (
                                     <span>
-                                        { `${regionQualifiedConsoleUrl ?? 
+                                        { `${regionQualifiedConsoleUrl ??
                                             "https://console.asgardeo.io"}/${tenantPrefix ?? "t"}/` }
                                         <span
                                             className={ `${
diff --git a/apps/console/src/index.html b/apps/console/src/index.html
index fae9170236e..1aff3f12d4f 100644
--- a/apps/console/src/index.html
+++ b/apps/console/src/index.html
@@ -133,7 +133,7 @@
             var legacyAuthzRuntime = startupConfig.legacyAuthzRuntime;
             var isAdaptiveAuthenticationAvailable = true;
             var isOrganizationManagementEnabled = true;
-
+<!--            sessionStorage.setItem("auth_callback_url_console", null);-->
             if (window.top === window.self && sessionStorage.getItem("auth_callback_url_console") === null) {
                 var authCallbackUrl = window.location.pathname + window.location.hash;
 
diff --git a/apps/console/src/index.tsx b/apps/console/src/index.tsx
index 75ab8cd8c21..89285026fbe 100644
--- a/apps/console/src/index.tsx
+++ b/apps/console/src/index.tsx
@@ -68,14 +68,14 @@ const RootWithConfig = (): ReactElement => {
     const [ ready, setReady ] = React.useState(false);
 
     React.useEffect(() => {
-        if (AuthenticateUtils.getInitializeConfig()?.baseUrl) {
+        if (Config.getDeploymentConfig().isRegionalConsole? AuthenticateUtils.getInitializeCentralConfig()?.baseUrl : AuthenticateUtils.getInitializeConfig()?.baseUrl) {
             setReady(true);
 
             return;
         }
 
         setReady(false);
-    }, [ AuthenticateUtils.getInitializeConfig()?.baseUrl ]);
+    }, [ Config.getDeploymentConfig().isRegionalConsole? AuthenticateUtils.getInitializeCentralConfig()?.baseUrl : AuthenticateUtils.getInitializeConfig()?.baseUrl ]);
 
     if (!ready) {
         return <PreLoader />;
@@ -88,7 +88,7 @@ const RootWithConfig = (): ReactElement => {
                     <UserPreferencesProvider<UserPreferencesInterface>>
                         <BrowserRouter>
                             <AuthProvider
-                                config={ AuthenticateUtils.getInitializeConfig() }
+                                config={ Config.getDeploymentConfig().isRegionalConsole? AuthenticateUtils.getInitializeCentralConfig() : AuthenticateUtils.getInitializeConfig() }
                                 fallback={ <PreLoader /> }
                                 getAuthParams={ getAuthParams }
                             >
diff --git a/apps/console/src/init/app-utils.ts b/apps/console/src/init/app-utils.ts
index 738f5fab6b5..bb8df6f3884 100644
--- a/apps/console/src/init/app-utils.ts
+++ b/apps/console/src/init/app-utils.ts
@@ -230,6 +230,27 @@ export const AppUtils: any = (function() {
             return `${_config.clientOrigin}${this.getAppBaseWithTenantAndOrganization()}`;
         },
 
+        /**
+                 * Get the central config object.
+                 *
+                 * @returns Central Deployment Configuration.
+                 */
+                getCentralConfig: function() {
+
+                    return {
+                        centralServerOrigin: _config.centralServerOrigin,
+                        serverOriginWithTenant: _config.centralServerOrigin + this.getTenantPath(true),
+                        clientID: (this.isSaas() || this.isSuperTenant())
+                            ? _config.clientID
+                            : _config.clientID + "_" + this.getTenantName(),
+                        idpConfigs: this.resolveIdpConfigs(_config.centralServerOrigin),
+                        session: _config.session,
+                        loginCallbackURL: this.constructRedirectURLs(_config.loginCallbackPath),
+                        logoutCallbackURL: this.constructRedirectURLs(_config.logoutCallbackPath),
+                        serverOrigin: _config.centralServerOrigin
+                    }
+                },
+
         /**
          * Get the config object.
          *
@@ -297,6 +318,7 @@ export const AppUtils: any = (function() {
                 getProfileInfoFromIDToken: _config.getProfileInfoFromIDToken,
                 idpConfigs: this.resolveIdpConfigs(),
                 isSaas: this.isSaas(),
+                isRegionalConsole: _config.isRegionalConsole,
                 legacyAuthzRuntime: _config.legacyAuthzRuntime,
                 loginCallbackURL: this.constructRedirectURLs(_config.loginCallbackPath),
                 logoutCallbackURL: this.constructRedirectURLs(_config.logoutCallbackPath),
@@ -311,6 +333,7 @@ export const AppUtils: any = (function() {
                     logout: this.constructAppPaths(_config.routePaths.logout)
                 },
                 serverOrigin: _config.serverOrigin,
+                centralServerOrigin: _config.centralServerOrigin,
                 serverOriginWithTenant: this.getServerOriginWithTenant(),
                 session: _config.session,
                 superTenant: this.getSuperTenant(),
@@ -617,13 +640,13 @@ export const AppUtils: any = (function() {
          *
          * @returns Resolved IDP configs.
          */
-        resolveIdpConfigs: function() {
+        resolveIdpConfigs: function(paramserverOrigin: string) {
             return {
                 serverOrigin: this.isSaas()
-                    ? _config.serverOrigin
-                    : _config.serverOrigin + this.getTenantPath(true),
+                    ? paramserverOrigin
+                    : paramserverOrigin + this.getTenantPath(true),
                 ..._config.idpConfigs,
-                ...this.resolveURLs()
+                ...this.resolveURLs(paramserverOrigin)
             };
         },
 
@@ -634,20 +657,20 @@ export const AppUtils: any = (function() {
          *
          * @returns Resolved URLs.
          */
-        resolveURLs: function() {
-            const getReplaceServerOrigin = () => {
+        resolveURLs: function(serverOrigin: string) {
+            const getReplaceServerOrigin = (serverOrigin: string) => {
                 if (_config.legacyAuthzRuntime) {
-                    return _config.serverOrigin;
+                    return serverOrigin;
                 }
 
-                return _config.serverOrigin + this.getTenantPath(true);
+                return serverOrigin + this.getTenantPath(true);
             };
 
             return {
                 authorizeEndpointURL: _config.idpConfigs
                         && _config.idpConfigs.authorizeEndpointURL
                         && _config.idpConfigs.authorizeEndpointURL
-                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin())
+                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin(serverOrigin))
                             .replace(TENANT_PREFIX_IDP_URL_PLACEHOLDER, this.getTenantPrefix())
                             .replace(SUPER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getSuperTenantProxy())
                             .replace(USER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getTenantName()
@@ -659,7 +682,7 @@ export const AppUtils: any = (function() {
                 jwksEndpointURL: _config.idpConfigs
                         && _config.idpConfigs.jwksEndpointURL
                         && _config.idpConfigs.jwksEndpointURL
-                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin())
+                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin(serverOrigin))
                             .replace(TENANT_PREFIX_IDP_URL_PLACEHOLDER, this.getTenantPrefix())
                             .replace(SUPER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getSuperTenantProxy())
                             .replace(USER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getTenantName()
@@ -668,7 +691,7 @@ export const AppUtils: any = (function() {
                 logoutEndpointURL: _config.idpConfigs
                         && _config.idpConfigs.logoutEndpointURL
                         && _config.idpConfigs.logoutEndpointURL
-                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin())
+                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin(serverOrigin))
                             .replace(TENANT_PREFIX_IDP_URL_PLACEHOLDER, this.getTenantPrefix())
                             .replace(SUPER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getSuperTenantProxy())
                             .replace(USER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getTenantName()
@@ -677,7 +700,7 @@ export const AppUtils: any = (function() {
                 oidcSessionIFrameEndpointURL: _config.idpConfigs
                         && _config.idpConfigs.oidcSessionIFrameEndpointURL
                         && _config.idpConfigs.oidcSessionIFrameEndpointURL
-                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin())
+                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin(serverOrigin))
                             .replace(TENANT_PREFIX_IDP_URL_PLACEHOLDER, this.getTenantPrefix())
                             .replace(SUPER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getSuperTenantProxy())
                             .replace(USER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getTenantName()
@@ -686,7 +709,7 @@ export const AppUtils: any = (function() {
                 tokenEndpointURL: _config.idpConfigs
                         && _config.idpConfigs.tokenEndpointURL
                         && _config.idpConfigs.tokenEndpointURL
-                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin())
+                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin(serverOrigin))
                             .replace(TENANT_PREFIX_IDP_URL_PLACEHOLDER, this.getTenantPrefix())
                             .replace(SUPER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getSuperTenantProxy())
                             .replace(USER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getTenantName()
@@ -695,7 +718,7 @@ export const AppUtils: any = (function() {
                 tokenRevocationEndpointURL: _config.idpConfigs
                         && _config.idpConfigs.tokenRevocationEndpointURL
                         && _config.idpConfigs.tokenRevocationEndpointURL
-                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin())
+                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin(serverOrigin))
                             .replace(TENANT_PREFIX_IDP_URL_PLACEHOLDER, this.getTenantPrefix())
                             .replace(SUPER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getSuperTenantProxy())
                             .replace(USER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getTenantName()
@@ -704,7 +727,7 @@ export const AppUtils: any = (function() {
                 wellKnownEndpointURL: _config.idpConfigs
                         && _config.idpConfigs.wellKnownEndpointURL
                         && _config.idpConfigs.wellKnownEndpointURL
-                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin())
+                            .replace(SERVER_ORIGIN_IDP_URL_PLACEHOLDER, getReplaceServerOrigin(serverOrigin))
                             .replace(TENANT_PREFIX_IDP_URL_PLACEHOLDER, this.getTenantPrefix())
                             .replace(SUPER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getSuperTenantProxy())
                             .replace(USER_TENANT_DOMAIN_IDP_URL_PLACEHOLDER, this.getTenantName()
diff --git a/apps/console/src/protected-app.tsx b/apps/console/src/protected-app.tsx
index 33c4d82e178..7a159684eeb 100644
--- a/apps/console/src/protected-app.tsx
+++ b/apps/console/src/protected-app.tsx
@@ -81,12 +81,17 @@ import {
 } from "./features/core";
 import { AppConstants } from "./features/core/constants";
 import { history } from "./features/core/helpers";
+import { setCurrentEnvironment, setLoggedInUserId } from "./features/core/store/actions/environment";
 import useRoutes from "./features/core/hooks/use-routes";
 import useOrganizationSwitch from "./features/organizations/hooks/use-organization-switch";
 import {
     GovernanceCategoryForOrgsInterface,
     useGovernanceConnectorCategories
 } from "./features/server-configurations";
+import {
+    TokenConstants
+} from "@wso2is/core/constants";
+const LOGOUT_URL: string = "sign_out_url-instance_0-CONSOLE";
 
 const App: LazyExoticComponent<FunctionComponent> = lazy(() => import("./app"));
 
@@ -101,7 +106,11 @@ export const ProtectedApp: FunctionComponent<AppPropsInterface> = (): ReactEleme
     const {
         on,
         signIn,
-        state: { isAuthenticated }
+        state: { isAuthenticated },
+        updateConfig,
+        getDecodedIDToken,
+        getIDToken,
+        requestCustomGrant,
     } = useAuthContext();
 
     const dispatch: Dispatch<any> = useDispatch();
@@ -123,7 +132,7 @@ export const ProtectedApp: FunctionComponent<AppPropsInterface> = (): ReactEleme
         (state: AppState) => state.organization.isFirstLevelOrganization
     );
     const allowedScopes: string = useSelector((state: AppState) => state?.auth?.allowedScopes);
-
+    const [ tenant, setTenant ] = useState<string>("");
     const {
         data: originalConnectorCategories,
         error: connectorCategoriesFetchRequestError
@@ -158,14 +167,19 @@ export const ProtectedApp: FunctionComponent<AppPropsInterface> = (): ReactEleme
         on(Hooks.HttpRequestSuccess, HttpUtils.onHttpRequestSuccess);
 
         on(Hooks.SignIn, async (signInResponse: BasicUserInfo) => {
-            let response: BasicUserInfo = null;
+            let response: BasicUserInfo = { ...signInResponse };
 
+            const idToken: DecodedIDTokenPayload = await getDecodedIDToken();
+            const isPrivilegedUser: boolean =
+                idToken?.amr?.length > 0
+                    ? idToken?.amr[ 0 ] === "EnterpriseIDPAuthenticator"
+                    : false;
             const getOrganizationName = () => {
                 const path: string = SessionStorageUtils.getItemFromSessionStorage("auth_callback_url_console")
                     ?? window.location.pathname;
                 const pathChunks: string[] = path.split("/");
 
-                const orgPrefixIndex: number = pathChunks.indexOf(Config.getDeploymentConfig().organizationPrefix);
+                const orgPrefixIndex: number = pathChunks.indexOf(window["AppUtils"].getConfig().organizationPrefix);
 
                 if (orgPrefixIndex !== -1) {
                     return pathChunks[ orgPrefixIndex + 1 ];
@@ -173,20 +187,48 @@ export const ProtectedApp: FunctionComponent<AppPropsInterface> = (): ReactEleme
 
                 return "";
             };
-
+            let associatedTenants = []
+            if (response?.orgUserAssociations) {
+                associatedTenants = JSON.parse(response?.orgUserAssociations)?.map((association) => association?.orgName);
+            }
             try {
-                // The organization switch is not needed for organization users who directly SSO to the organization.
-                if (getOrganizationName() && signInResponse.userOrg != signInResponse.orgId) {
+                response = { ...signInResponse };
+                dispatch(setLoggedInUserId(idToken?.userid));
+                console.log("logged in user id...", idToken?.userid)
+                let switchingTenant: string = ""
+                if (Config.getDeploymentConfig().isRegionalConsole) {
+                    console.log("regional switch")
+                    response = await switchRegionalConsole(response?.orgUserAssociations);
+                    switchingTenant  = CommonAuthenticateUtils.deriveTenantDomainFromSubject(response.sub);
+                    console.log("regional response", response)
+                }
+                console.log("switching tenant", switchingTenant)
+                if (getOrganizationName()) {
+                    await updateConfig(
+                        {
+                            endpoints: {
+                                authorizationEndpoint: Config.getDeploymentConfig().serverOrigin + "/t/" + switchingTenant + "/oauth2/authorize",
+                                checkSessionIframe: Config.getDeploymentConfig().serverOrigin + "/t/" + switchingTenant + "/oidc/checksession",
+                                tokenEndpoint: Config.getDeploymentConfig().serverOrigin + "/t/" + switchingTenant + "/oauth2/token",
+                                jwksUri: Config.getDeploymentConfig().serverOrigin + "/t/" + switchingTenant + "/oauth2/jwks",
+                                issuer: Config.getDeploymentConfig().serverOrigin + "/t/" + switchingTenant + "/oauth2/token",
+                                // issuer: "https://api.eu.asg.io/o/ee9bf9e5-f446-4d5b-b9c0-41d9fcb8d890/oauth2/token",
+                                endSessionEndpoint: Config.getDeploymentConfig().centralServerOrigin + "/t/a" + "/oidc/logout"
+                            },
+                            resourceServerURLs: [Config.getDeploymentConfig().serverOrigin]
+                        }
+                    );
                     response = await switchOrganization(getOrganizationName());
-                } else {
-                    response = { ...signInResponse };
+                    console.log("switching org response...", response)
                 }
-
+                console.log("found the response after the switch", response)
                 await onSignIn(
                     response,
                     () => null,
-                    (idToken: DecodedIDTokenPayload) => loginSuccessRedirect(idToken),
-                    () => setRenderApp(true)
+                    (idToken: DecodedIDTokenPayload) => loginSuccessRedirect(idToken, isPrivilegedUser),
+                    () => setRenderApp(true),
+                    isPrivilegedUser,
+                    associatedTenants
                 );
             } catch(e) {
                 // TODO: Handle error
@@ -204,7 +246,7 @@ export const ProtectedApp: FunctionComponent<AppPropsInterface> = (): ReactEleme
         setGovernanceConnectors(originalConnectorCategories);
     }, [ originalConnectorCategories ]);
 
-    const loginSuccessRedirect = (idToken: DecodedIDTokenPayload): void => {
+    const loginSuccessRedirect = (idToken: DecodedIDTokenPayload, isPrivilegedUser: boolean): void => {
         const AuthenticationCallbackUrl: string = CommonAuthenticateUtils.getAuthenticationCallbackUrl(
             CommonAppConstants.CONSOLE_APP
         );
@@ -214,17 +256,17 @@ export const ProtectedApp: FunctionComponent<AppPropsInterface> = (): ReactEleme
          */
         if (commonConfig?.enableOrganizationAssociations) {
 
-            const isPrivilegedUser: boolean =
-                idToken?.amr?.length > 0
-                    ? idToken?.amr[ 0 ] === "EnterpriseIDPAuthenticator"
-                    : false;
-
             let isOrgSwitch: boolean = false;
 
             if (has(idToken, "org_id") && has(idToken, "user_org")) {
                 isOrgSwitch = (idToken?.org_id !== idToken?.user_org);
             }
-            if (has(idToken, "associated_tenants") || isPrivilegedUser || isOrgSwitch) {
+            let isRegionalSwitch: boolean = false;
+            isRegionalSwitch = idToken?.amr?.length > 0
+                ? idToken?.amr[0] === "region_switch"
+                : false;
+
+            if (has(idToken, "associated_tenants") || isPrivilegedUser || isOrgSwitch || isRegionalSwitch) {
                 // If there is an association, the user should be redirected to console landing page.
                 const location: string =
                     !AuthenticationCallbackUrl ||
@@ -243,14 +285,14 @@ export const ProtectedApp: FunctionComponent<AppPropsInterface> = (): ReactEleme
                         : AuthenticationCallbackUrl;
 
                 history.push(location);
-            } else {
-                // If there is no assocation, the user should be redirected to creation flow.
-                history.push({
-                    pathname: AppConstants.getPaths().get(
-                        "CREATE_TENANT"
-                    )
-                });
-            }
+            } // else {
+            //     // If there is no assocation, the user should be redirected to creation flow.
+            //     history.push({
+            //         pathname: AppConstants.getPaths().get(
+            //             "CREATE_TENANT"
+            //         )
+            //     });
+            // }
         } else {
             const location: string =
                 !AuthenticationCallbackUrl ||
@@ -271,6 +313,114 @@ export const ProtectedApp: FunctionComponent<AppPropsInterface> = (): ReactEleme
         }
     };
 
+    const switchRegionalConsole = async (orgUserAssociations: string):  Promise<BasicUserInfo> => {
+        const idTokenTemp: DecodedIDTokenPayload = await getDecodedIDToken();
+        const unDecodedIdToken: string = await getIDToken();
+        const isPrivilegedUser: boolean =
+            idTokenTemp?.amr?.length > 0
+                ? idTokenTemp?.amr[0] === "EnterpriseIDPAuthenticator"
+                : false;
+
+
+
+        let envid: string;
+        if (isPrivilegedUser) {
+            envid = JSON.parse(idTokenTemp?.login_environment)?.envUUID
+            dispatch(setCurrentEnvironment(JSON.parse(idTokenTemp?.login_environment)));
+        } else {
+            envid = JSON.parse(idTokenTemp?.org_user_associations)[0]?.environments?.[0]?.envUUID;
+        }
+        let tenantDomainName: string = "";
+        let b2bOrgId : string = "";
+        // Ge th the tenant domain name from the session storage.
+        if (sessionStorage.getItem("user_tenant")) {
+            tenantDomainName = sessionStorage.getItem("user_tenant");
+        }
+        if (!isPrivilegedUser) {
+            const associations: string = orgUserAssociations;
+            const orgData = JSON.parse(associations);
+            if (tenantDomainName != null && tenantDomainName !== "") {
+                for (const org of orgData) {
+                    const orgName: string = org.orgName;
+
+                    if (orgName == tenantDomainName) {
+                        for (const env of org.environments) {
+                            // ATM we only need to consider the prod env switch.
+                            // we need to improve this with env switcher.
+                            if (env.envName === "prod") {
+                                envid = env.envUUID;
+                                b2bOrgId = env.b2bOrgUUID;
+                                dispatch(setCurrentEnvironment(env));
+                            }
+                        }
+                    }
+                }
+            } else {
+                for (const org of orgData) {
+                    for (const env of org.environments) {
+                        if (env.isDefault) {
+                            envid = env.envUUID;
+                            dispatch(setCurrentEnvironment(env));
+                            tenantDomainName = org.orgName;
+                            b2bOrgId = env.b2bOrgUUID;
+                            break;
+                        }
+                    }
+                }
+
+            }
+            sessionStorage.setItem("associations", associations);
+        } else {
+            sessionStorage.setItem("associations", "[]");
+        }
+        let response: BasicUserInfo = null;
+        await updateConfig(
+            {
+                endpoints: {
+                    authorizationEndpoint: Config.getDeploymentConfig().serverOrigin + "/t/" + tenantDomainName + "/oauth2/authorize",
+                    checkSessionIframe: Config.getDeploymentConfig().serverOrigin + "/t/" + tenantDomainName + "/oidc/checksession",
+                    tokenEndpoint: Config.getDeploymentConfig().serverOrigin + "/t/" + tenantDomainName + "/oauth2/token",
+                    jwksUri: Config.getDeploymentConfig().serverOrigin + "/t/" + tenantDomainName + "/oauth2/jwks",
+                    issuer: Config.getDeploymentConfig().serverOrigin + "/o/" + b2bOrgId + "/oauth2/token",
+                    // issuer: "https://api.eu.asg.io/o/ee9bf9e5-f446-4d5b-b9c0-41d9fcb8d890/oauth2/token",
+                    endSessionEndpoint: Config.getDeploymentConfig().centralServerOrigin + "/t/a" + "/oidc/logout"
+                },
+                resourceServerURLs: [Config.getDeploymentConfig().serverOrigin]
+            }
+        );
+        await requestCustomGrant(
+            {
+                attachToken: false,
+                data: {
+                    client_id: "CONSOLE",
+                    grant_type: "region_switch",
+                    scope:
+                        window["AppUtils"]
+                            .getConfig()
+                            .idpConfigs?.scope.join(" ") ??
+                        TokenConstants.SYSTEM_SCOPE,
+                    environment_id: envid,
+                    token: "{{token}}",
+                    idToken: unDecodedIdToken
+                },
+                id: "regionalSwitch",
+                returnsSession: true,
+                signInRequired: true
+            },
+            async (grantResponse: BasicUserInfo) => {
+
+                response = { ...grantResponse };
+                const tenantDomain1: string =
+                    CommonAuthenticateUtils.deriveTenantDomainFromSubject(grantResponse.sub);
+                console.log("setting the tenant..", tenantDomain1)
+                setTenant(tenantDomain1);
+
+                console.log("dispatched tenant domain..", tenant)
+            }
+        );
+        return response;
+    };
+
     useEffect(() => {
         if (!isAuthenticated) {
             return;
diff --git a/apps/console/src/public/deployment.config.json b/apps/console/src/public/deployment.config.json
index d2acadf1400..ef73dda3a81 100644
--- a/apps/console/src/public/deployment.config.json
+++ b/apps/console/src/public/deployment.config.json
@@ -46,12 +46,15 @@
             "profile"
         ],
         "serverOrigin": "https://localhost:9443",
-        "responseMode": "query"
+        "responseMode": "query",
+        "tokenEndpointURL": "${serverOrigin}/${tenantPrefix}/${userTenantDomain}/oauth2/token"
     },
     "i18nResourcePath": "",
     "loginCallbackPath": "",
     "logoutCallbackPath": "",
+    "centralLogoutServerOrigin": "https://console.asg.io/t/a/oidc/logout",
     "serverOrigin": "https://localhost:9443",
+    "centralServerOrigin": "https://api.asg.io",
     "routePaths": {
         "home": "/getting-started",
         "login": "",