diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 897e59b4..940ad55e 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -801,16 +801,15 @@
644
-
-
-
-
-
-
-
-
-
+
+
+ ${pom.artifactId}-${pom.version}/repository/conf/etc
+ true
+ 644
+
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 91feb5e8..31530aad 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -125,10 +125,18 @@
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version}
-
-
-
-
+
+ org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.enterprise.store.feature:${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.devicemgt:org.wso2.carbon.dynamic.client.registration.server.feature:${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
+
@@ -388,15 +396,6 @@
-
-
-
-
-
- org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.enterprise.store.feature:${carbon.device.mgt.version}
-
-
-
@@ -647,11 +646,22 @@
org.wso2.carbon.device.mgt.group.server.feature.group
${carbon.device.mgt.version}
-
-
-
-
-
+
+ org.wso2.carbon.device.mgt.enterprise.store.feature.group
+ ${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.certificate.mgt.server.feature.group
+ ${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.dynamic.client.registration.server.feature.group
+ ${carbon.device.mgt.version}
+
+
+ org.wso2.carbon.webapp.authenticator.framework.server.feature.group
+ ${carbon.device.mgt.version}
+
@@ -1001,14 +1011,6 @@
${axis2-transports.wso2.version}
-
-
-
-
- org.wso2.carbon.device.mgt.enterprise.store.feature.group
- ${carbon.device.mgt.version}
-
-