diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 1ce13c3f..f99fef46 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -983,14 +983,15 @@
         </file>
 
         <!--============ Added with ES Features ===============-->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/association-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!-- Removed with version 2.3.5-SNAPSHOT-->
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/association-config.xml-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>-->
+            <!--<filtered>true</filtered>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
         <!--============ Added with ES Features ===============-->
         <file>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index c5379e6f..5aaac833 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -157,9 +157,6 @@
                                 <!-- End of Jaggery Features -->
 
                                 <!-- Carbon Deployment Features -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.feature:${carbon.deployment.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.feature:${carbon.deployment.version}
                                 </featureArtifactDef>
@@ -355,6 +352,15 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.governance:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.governance:org.wso2.carbon.registry.extensions.server.feature:${carbon.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.governance:org.wso2.carbon.governance.lifecycle.management.server.feature:${carbon.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.governance:org.wso2.carbon.governance.metadata.server.feature:${carbon.governance.version}
+                                </featureArtifactDef>
 
                                 <!-- API Management Features -->
                                 <featureArtifactDef>
@@ -679,7 +685,7 @@
 
                                 <!-- Carbon Deployment Features -->
                                 <feature>
-                                    <id>org.wso2.carbon.module.mgt.feature.group</id>
+                                    <id>org.wso2.carbon.module.mgt.server.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
                                 <feature>
@@ -956,6 +962,18 @@
 									<id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id>
 									<version>${carbon.registry.version}</version>
 								</feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.lifecycle.management.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.metadata.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
                                 <!-- End of Governance Features -->
 
                                 <!-- API Management Features -->
diff --git a/pom.xml b/pom.xml
index 6d133036..1e5e2130 100644
--- a/pom.xml
+++ b/pom.xml
@@ -809,20 +809,20 @@
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
         <!--Jaggery -->
-        <jaggery.version>0.10.3</jaggery.version>
-        <jaggery.extensions.version>1.3.3</jaggery.extensions.version>
-        <jaggery.extensions.sso.version>1.3.3</jaggery.extensions.sso.version>
-        <jaggery.extensions.carbon.version>1.3.3</jaggery.extensions.carbon.version>
-        <jaggery.extensions.test.version>1.3.3</jaggery.extensions.test.version>
+        <jaggery.version>0.10.2</jaggery.version>
+        <jaggery.extensions.version>1.4.0</jaggery.extensions.version>
+        <jaggery.extensions.sso.version>1.4.0</jaggery.extensions.sso.version>
+        <jaggery.extensions.carbon.version>1.4.0</jaggery.extensions.carbon.version>
+        <jaggery.extensions.test.version>1.4.0</jaggery.extensions.test.version>
 
         <!--Additional Jaggery Stuff-->
-        <caramel.feature.version>1.0.1</caramel.feature.version>
-        <handlebars.feature.version>1.0.0</handlebars.feature.version>
-        <markdown.feature.version>1.0.0</markdown.feature.version>
+        <caramel.feature.version>1.4.0</caramel.feature.version>
+        <handlebars.feature.version>1.4.0</handlebars.feature.version>
+        <markdown.feature.version>1.4.0</markdown.feature.version>
 
         <!-- Store Features -->
-        <carbon.store.version>2.3.1</carbon.store.version>
-        <carbon.social.version>2.3.1</carbon.social.version>
+        <carbon.store.version>2.3.5-SNAPSHOT</carbon.store.version>
+        <carbon.social.version>2.3.5-SNAPSHOT</carbon.social.version>
 
         <!-- Additional Stuff from ES Features -->
         <carbon.dashboards.version>1.0.0</carbon.dashboards.version>
@@ -860,11 +860,11 @@
         <carbon.multitenancy.version>4.4.1</carbon.multitenancy.version>
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.4.6</carbon.registry.version>
+        <carbon.registry.version>4.4.8</carbon.registry.version>
         <carbon.registry.package.import.version.range>[4.4.1, 4.5.0)</carbon.registry.package.import.version.range>
 
         <!-- Carbon Governance -->
-        <carbon.governance.version>4.5.3</carbon.governance.version>
+        <carbon.governance.version>4.5.8</carbon.governance.version>
 
         <!-- Carbon Device Management -->
         <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>