diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 098e4b81..aa80eb8f 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -182,6 +182,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.deployment:org.wso2.carbon.service.mgt.server.feature:${carbon.deployment.version}
                                 </featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.deployment:org.wso2.carbon.application.deployer.webapp.feature:${carbon.deployment.version}
+								</featureArtifactDef>
                                 <!-- End of Carbon Deployment Features -->
 
                                 <!-- Jaggery Features -->
@@ -501,6 +504,12 @@
                                 </featureArtifactDef>
                                 <!-- End of app manager feature-->
 
+								<!-- ************** START - Capp Management ********* -->
+								<featureArtifactDef>
+									org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
+								</featureArtifactDef>
+								<!-- ************** END - Capp Management ********* -->
+
                                 <!-- Cipher tools feature -->
 
                                 <featureArtifactDef>
@@ -533,6 +542,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.message.flows.feature:${carbon.commons.version}
                                 </featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.commons:org.wso2.carbon.ndatasource.capp.deployer.server.feature:${carbon.commons.version}
+								</featureArtifactDef>
 
                                 <!-- Identity Features -->
                                 <!-- SSO -->
@@ -938,6 +950,10 @@
                                     <id>org.wso2.carbon.service.mgt.server.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.application.deployer.webapp.feature.group</id>
+									<version>${carbon.deployment.version}</version>
+								</feature>
                                 <!-- End of Carbon Deployment Features -->
 
                                 <!-- Jaggery Features -->
@@ -1013,6 +1029,11 @@
                                 </feature>
                                 <!-- End of Carbon Analytics Common Features -->
 
+								<feature>
+									<id>org.wso2.carbon.application.mgt.feature.group</id>
+									<version>${carbon.commons.version}</version>
+								</feature>
+
                                 <!-- Carbon Commons Features -->
                                 <feature>
                                     <id>org.wso2.carbon.logging.mgt.feature.group</id>
@@ -1307,6 +1328,10 @@
                                     <id>org.wso2.carbon.ndatasource.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.ndatasource.capp.deployer.server.feature.group</id>
+									<version>${carbon.commons.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.ntask.core.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2490,6 +2515,10 @@
                                     <id>org.wso2.carbon.ntask.core.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.application.mgt.feature.group</id>
+									<version>${carbon.commons.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.logging.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2771,6 +2800,10 @@
                                     <id>org.wso2.carbon.ndatasource.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.ndatasource.capp.deployer.server.feature.group</id>
+									<version>${carbon.commons.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
@@ -2788,6 +2821,10 @@
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.application.deployer.webapp.feature.group</id>
+									<version>${carbon.deployment.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -3342,6 +3379,10 @@
                                     <id>org.wso2.carbon.ndatasource.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.ndatasource.capp.deployer.server.feature.group</id>
+									<version>${carbon.commons.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
@@ -3359,6 +3400,10 @@
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.application.deployer.webapp.feature.group</id>
+									<version>${carbon.deployment.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>