diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index ccab0c7c..970882c6 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -604,9 +604,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.messageconsole.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.dashboard.feature:${carbon.analytics.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.activitydashboard.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
@@ -692,12 +689,18 @@
                                     org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
                                 </featureArtifactDef>
                                 <!--End of DAS Feature-->
+
+                                <!-- Dashboards Features -->
                                 <feaureArtifactDef>
                                     org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.shindig.feature:${carbon.dashboard.version}
                                 </feaureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.deployment.feature:${carbon.dashboard.version}
+                                </featureArtifactDef>
+                                <!-- End of Dashboards Features -->
 
                                 <!-- MB Features -->
                                 <featureArtifactDef>
@@ -1367,10 +1370,6 @@
                                     <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.analytics.dashboard.feature.group</id>
-                                    <version>${carbon.analytics.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.analytics.activitydashboard.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
@@ -1471,8 +1470,9 @@
                                     <id>org.wso2.carbon.event.execution.manager.feature.group</id>
                                     <version>${carbon.analytics.common.version}</version>
                                 </feature>
-
                                 <!-- ************** END - EVENT PROCESSING FEATURES ************ -->
+
+                                <!-- Dashboard Features -->
                                 <feature>
                                     <id>org.wso2.carbon.dashboards.shindig.feature.group</id>
                                     <version>${carbon.dashboard.version}</version>
@@ -1481,6 +1481,12 @@
                                     <id>org.wso2.carbon.dashboards.portal.feature.group</id>
                                     <version>${carbon.dashboard.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboard.deployment.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <!-- End of Dashboard Features -->
+
                                 <feature>
                                     <id>org.wso2.carbon.andes.server.feature.group</id>
                                     <version>${carbon.messaging.version}</version>