diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 967980a0..29b7ea22 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -949,7 +949,7 @@
         <!-- 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>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/scripts</outputDirectory>
         </fileSet>
 
         <!-- ********************************* End of Analytics Profile ********************************* -->
diff --git a/pom.xml b/pom.xml
index aed887b9..ef83b643 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1517,14 +1517,14 @@
         <carbon.governance.version>4.7.0</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.10</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.13</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-	    <carbon.device.mgt.plugin.version>4.0.8</carbon.device.mgt.plugin.version>
+	    <carbon.device.mgt.plugin.version>4.0.13</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.94</carbon.api.mgt.version>