diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 322d080c3b..cf157931f1 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1027,6 +1027,20 @@
             <outputDirectory>wso2is-${pom.version}/repository/conf/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/organization-mgt.xml
+            </source>
+            <outputDirectory>wso2is-${pom.version}/repository/conf</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/templates/repository/conf/organization-mgt.xml.j2
+            </source>
+            <outputDirectory>wso2is-${pom.version}/repository/resources/conf/templates/repository/conf</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
 
         <!--In-Place Updates-->
         <file>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 27e82b067a..430ddaa9ab 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -526,6 +526,12 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.organization.management.core:org.wso2.carbon.identity.organization.management.core.server.feature:${identity.org.mgt.core.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.auth.organization.login:org.wso2.carbon.identity.auth.organization.login.server.feature:${identity.organization.login.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.extension.identity.oauth2.grantType.organizationswitch:org.wso2.carbon.identity.oauth2.grant.organizationswitch.server.feature:${identity.oauth2.grant.organizationswitch.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.local.auth.magiclink:org.wso2.carbon.identity.local.auth.magiclink.server.feature:${authenticator.magiclink.version}
                                 </featureArtifactDef>
@@ -1072,6 +1078,14 @@
                                     <id>org.wso2.carbon.identity.organization.management.core.server.feature.group</id>
                                     <version>${identity.org.mgt.core.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.auth.organization.login.server.feature.group</id>
+                                    <version>${identity.organization.login.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth2.grant.organizationswitch.server.feature.group</id>
+                                    <version>${identity.oauth2.grant.organizationswitch.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.local.auth.magiclink.server.feature.group</id>
                                     <version>${authenticator.magiclink.version}</version>
diff --git a/pom.xml b/pom.xml
index d850fa4e2e..15adcba51d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1989,6 +1989,16 @@
                 <artifactId>org.wso2.carbon.identity.organization.management.core.server.feature</artifactId>
                 <version>${identity.org.mgt.core.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.auth.organization.login</groupId>
+                <artifactId>org.wso2.carbon.identity.auth.organization.login.server.feature</artifactId>
+                <version>${identity.organization.login.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.extension.identity.oauth2.grantType.organizationswitch</groupId>
+                <artifactId>org.wso2.carbon.identity.oauth2.grant.organizationswitch.server.feature</artifactId>
+                <version>${identity.oauth2.grant.organizationswitch.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.outbound.provisioning.scim2</groupId>
                 <artifactId>org.wso2.carbon.identity.provisioning.connector.scim2.server.feature</artifactId>
@@ -2358,8 +2368,10 @@
         <authenticator.x509.version>3.1.11</authenticator.x509.version>
         <identity.extension.utils>1.0.14</identity.extension.utils>
 
-        <identity.org.mgt.version>1.3.51</identity.org.mgt.version>
-        <identity.org.mgt.core.version>1.0.57</identity.org.mgt.core.version>
+        <identity.org.mgt.version>1.3.52</identity.org.mgt.version>
+        <identity.org.mgt.core.version>1.0.58</identity.org.mgt.core.version>
+        <identity.organization.login.version>1.1.21</identity.organization.login.version>
+        <identity.oauth2.grant.organizationswitch.version>1.1.9</identity.oauth2.grant.organizationswitch.version>
 
         <!-- Hash Provider Versions-->
         <hashprovider.pbkdf2.version>0.1.4</hashprovider.pbkdf2.version>