diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml
index 9b3d5a53..176ff688 100644
--- a/modules/analytics/distribution/src/assembly/bin.xml
+++ b/modules/analytics/distribution/src/assembly/bin.xml
@@ -797,7 +797,7 @@
         <!-- Adding Geo Dashboard  configuration files and Capp -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/deployment/server/carbonapps/org_wso2_carbon_geo_dashboard-1.0.0.car
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.449.version}/repository/deployment/server/carbonapps/org_wso2_carbon_iot_geo_dashboard-1.0.0.car
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/</outputDirectory>
             <fileMode>644</fileMode>
diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml
index 066d630e..07a50ae0 100644
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@@ -386,7 +386,7 @@
                                 </featureArtifactDef>
                                 <!-- Geo Dashboard feature -->
                                 <featureArtifactDef>
-                                    org.wso2.carbon.event-processing:org.wso2.carbon.geo.dashboard.feature:${carbon.event-processing.version}
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.spark.common.udf.feature:${analytics.shared.version}
@@ -792,8 +792,8 @@
 
                                 <!-- Geo Dashboard Feature -->
                                 <feature>
-                                    <id>org.wso2.carbon.geo.dashboard.feature.group</id>
-                                    <version>${carbon.event-processing.version}</version>
+                                    <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
                             </features>
diff --git a/pom.xml b/pom.xml
index d208ecd1..2d377f27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1647,7 +1647,7 @@
         <orbit.version.h2>1.2.140.wso2v3</orbit.version.h2>
         <orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
         <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
-        <carbon.dashboard.version>2.0.3</carbon.dashboard.version>
+        <carbon.dashboard.version>2.0.4-SNAPSHOT</carbon.dashboard.version>
         <carbon.event-processing.version>2.1.4</carbon.event-processing.version>
         <imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
         <akka.version>2.3.4-spark</akka.version>