diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 484cb5cb..acb5ba51 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -729,12 +729,6 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
-        <file>
-            <source>src/repository/jaggeryapps/ues/configs/designer.json</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/configs
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
         <!-- End of "portal" app specific modifications -->
         <!-- Copying synapse.properties file -->
         <file>
@@ -1325,9 +1319,8 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-	
-	<!-- Copying virtual-fire-alarm-config.xml -->
-	<file>
+	    <!-- Copying virtual-fire-alarm-config.xml -->
+	    <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-mgt-plugins/virtual-fire-alarm/virtual-fire-alarm-config.xml
             </source>
@@ -1335,5 +1328,13 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <!-- Adding IoT Analytics Dashboard and gadget CApps -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
     </files>
 </assembly>
diff --git a/modules/distribution/src/repository/conf/carbon.xml b/modules/distribution/src/repository/conf/carbon.xml
index 44187b0c..84ef0927 100644
--- a/modules/distribution/src/repository/conf/carbon.xml
+++ b/modules/distribution/src/repository/conf/carbon.xml
@@ -79,6 +79,9 @@
 		<Role>${default.server.role}</Role>
 		<Role>${das.server.role}</Role>
 		<Role>${cep.server.role}</Role>
+		<Role>IoTServer</Role>
+		<Role>CDMFPlatform</Role>
+		<Role>GeoDashboard</Role>
 	</ServerRoles>
 
 	<!-- uncommnet this line to subscribe to a bam instance automatically -->
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 36421d80..ccab0c7c 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -714,6 +714,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version}
+                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -1496,6 +1499,10 @@
                                     <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.cdmf.feature.group</id>
+                                    <version>${cdmf.analytics.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>