diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 41361479..3eb56ef3 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -941,6 +941,12 @@
             </excludes>
         </fileSet>
 
+        <!-- GPL Siddhi Extension Script for Geo Fencing -->
+        <fileSet>
+            <directory>../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/scripts</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/scripts</outputDirectory>
+        </fileSet>
+
         <!-- ********************************* End of Analytics Profile ********************************* -->
 
         <!-- ********************************* Start of Broker Profile ********************************* -->
@@ -1613,6 +1619,14 @@
                 ${pom.artifactId}-${pom.version}/repository/resources/lifecycles
             </outputDirectory>
         </file>
+        <!-- Adding Geo Dashboard CApp -->
+        <file>
+            <source>
+                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/carbonapps/org_wso2_carbon_iot_geo_dashboard-1.0.0.car
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/analytics/</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
         <!-- ********************************* End of IoT Core Profile ********************************* -->
 
         <!-- ********************************* Start of Analytics Profile ********************************* -->
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index b628623f..a1808ba5 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -391,6 +391,10 @@
 								<featureArtifactDef>
 									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
 								</featureArtifactDef>
+                                <!-- GPL Siddhi Extension Script for Geo Fencing -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -828,6 +832,12 @@
 									<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
+                                
+                                <!-- GPL Siddhi Extension Script for Geo Fencing -->
+                                <feature>
+                                    <id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index c46b7ffb..e5084396 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -745,6 +745,11 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
+                                <!-- Geo Dashboard feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <!-- End of Geo Dashboard feature -->
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -1607,6 +1612,13 @@
                                     <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+
+                                <!-- Geo Dashboard Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Geo Dashboard Feature -->
                             </features>
                         </configuration>
                     </execution>
@@ -2484,6 +2496,13 @@
                                     <version>${identity.inbound.auth.saml.version}</version>
                                 </feature>
                                 <!-- SSO Fix-->
+
+                                <!-- Geo Dashboard Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Geo Dashboard Feature -->
                             </features>
                         </configuration>
                     </execution>
@@ -3119,6 +3138,13 @@
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
                                 <!-- SSO Fix-->
+
+                                <!-- Geo Dashboard Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Geo Dashboard Feature -->
                             </features>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index 467588b0..a80fcd51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1512,7 +1512,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>3.0.1</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.7</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1520,7 +1520,7 @@
 
         <!-- Carbon Device Management Plugins-->
 
-        <carbon.device.mgt.plugin.version>4.0.1</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.0.4</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>