diff --git a/modules/distribution/product/src/main/startup-scripts/diagnostics.sh b/modules/distribution/product/src/main/startup-scripts/diagnostics.sh
old mode 100644
new mode 100755
diff --git a/modules/p2-profile/product/pom.xml b/modules/p2-profile/product/pom.xml
index 3ebb16298f..6f317f84d2 100644
--- a/modules/p2-profile/product/pom.xml
+++ b/modules/p2-profile/product/pom.xml
@@ -280,10 +280,7 @@
                                     org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
                                 </featureArtifactDef>
 
-                                <featureArtifactDef>
-                                    org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.server.feature:${carbon.registry.version}
-                                </featureArtifactDef>
-               
+
                                 <!--API Management related feature-->
 
                                 <featureArtifactDef>
@@ -333,9 +330,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.governance:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.governance:org.wso2.carbon.governance.lifecycle.management.server.feature:${carbon.governance.version}
-                                </featureArtifactDef>
 
                                 <!-- Cloud API Manager related features -->
                                 <featureArtifactDef>
@@ -1107,10 +1101,6 @@
                                     <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity-inbound-auth-openid.version}</version>
@@ -1153,10 +1143,7 @@
                                     <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.websocket.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -1209,12 +1196,7 @@
                                     <version>${carbon.governance.version}</version>
                                 </feature>
 
-                                <feature>
-                                    <id>org.wso2.carbon.governance.lifecycle.management.server.feature.group</id>
-                                    <version>${carbon.governance.version}</version>
-                                </feature>
 
-                                
                                 <!--Identity Feature-->
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.feature.group</id>
@@ -1779,10 +1761,7 @@
                                     <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity-inbound-auth-openid.version}</version>
@@ -1825,10 +1804,7 @@
                                     <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
+
 
                                 <feature>
                                     <id>org.wso2.carbon.registry.ws.feature.group</id>
@@ -1855,11 +1831,6 @@
                                     <version>${carbon.governance.version}</version>
                                 </feature>
 
-                                <feature>
-                                    <id>org.wso2.carbon.governance.lifecycle.management.server.feature.group</id>
-                                    <version>${carbon.governance.version}</version>
-                                </feature>
-
 
                                 <!--Identity Feature-->
                                 <feature>
@@ -2331,7 +2302,7 @@
                                     <id>org.wso2.carbon.security.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                
+
                                 <feature>
                                     <id>org.wso2.carbon.registry.core.feature.group</id>
                                     <version>${carbon.registry.version}</version>
@@ -2386,10 +2357,7 @@
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity-inbound-auth-openid.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
                                     <version>${carbon.identity-inbound-auth-oauth.version}</version>
@@ -2411,10 +2379,7 @@
                                     <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.registry.ws.feature.group</id>
                                     <version>${carbon.registry.version}</version>
@@ -2427,10 +2392,6 @@
                                     <id>org.wso2.carbon.governance.metadata.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.user.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -2899,10 +2860,6 @@
                                     <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity-inbound-auth-openid.version}</version>
@@ -2941,10 +2898,7 @@
                                     <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.registry.ws.feature.group</id>
                                     <version>${carbon.registry.version}</version>
@@ -2990,10 +2944,7 @@
                                     <id>org.wso2.carbon.governance.metadata.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.identity.tenant.resource.manager</id>
                                     <version>${carbon.identity.governance.version}</version>
@@ -3406,10 +3357,6 @@
                                     <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity-inbound-auth-openid.version}</version>
@@ -3448,10 +3395,7 @@
                                     <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.registry.ws.feature.group</id>
                                     <version>${carbon.registry.version}</version>
@@ -3496,10 +3440,7 @@
                                     <id>org.wso2.carbon.governance.metadata.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.user.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -3962,10 +3903,6 @@
                                     <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
                                     <version>${carbon.identity-inbound-auth-oauth.version}</version>
@@ -3983,10 +3920,7 @@
                                     <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
-                                    <version>${carbon.registry.version}</version>
-                                </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.registry.ws.feature.group</id>
                                     <version>${carbon.registry.version}</version>
@@ -3999,10 +3933,6 @@
                                     <id>org.wso2.carbon.governance.metadata.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.user.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
diff --git a/pom.xml b/pom.xml
index 32ba8fae21..2228176adc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1282,12 +1282,12 @@
         <carbon.apimgt.ui.version>9.1.29</carbon.apimgt.ui.version>
 
         <!-- APIM Component Version -->
-        <carbon.apimgt.version>9.29.77</carbon.apimgt.version>
+        <carbon.apimgt.version>9.29.80</carbon.apimgt.version>
 
         <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.8.30</carbon.registry.version>
+        <carbon.registry.version>4.8.31</carbon.registry.version>
         <carbon.registry.package.import.version.range>[4.7.0, 5.0.0)</carbon.registry.package.import.version.range>