diff --git a/modules/components/org.wso2.iot.core.admin.styles/pom.xml b/modules/components/org.wso2.iot.core.admin.styles/pom.xml
index a2f93bf0..f34d0676 100644
--- a/modules/components/org.wso2.iot.core.admin.styles/pom.xml
+++ b/modules/components/org.wso2.iot.core.admin.styles/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-components</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/components/pom.xml b/modules/components/pom.xml
index 6ed27720..c4f49923 100644
--- a/modules/components/pom.xml
+++ b/modules/components/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 65ea1096..f4d95c0d 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.1.0-update10-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/distribution/src/analytics/samples/connected-cup/pom.xml b/modules/distribution/src/analytics/samples/connected-cup/pom.xml
index f381ba44..9d65b119 100644
--- a/modules/distribution/src/analytics/samples/connected-cup/pom.xml
+++ b/modules/distribution/src/analytics/samples/connected-cup/pom.xml
@@ -162,4 +162,4 @@
         <carbon.device.mgt.plugin.version>@carbon-device-mgt-plugin-version@</carbon.device.mgt.plugin.version>
         <org.coffeeking.version>1.0.0</org.coffeeking.version>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/analytics/samples/device-plugins/pom.xml b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
index 8f8cb4c2..76a1a26e 100644
--- a/modules/distribution/src/analytics/samples/device-plugins/pom.xml
+++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.iot.analytics.devicemgt-plugins</groupId>
     <artifactId>analytics-devicetype-feature-installation</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.0-update10-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino Device Types - Analytics</name>
     <url>http://wso2.org</url>
diff --git a/modules/distribution/src/core/samples/connectedcup/component/agent/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/agent/pom.xml
index 14540069..8a225f88 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/agent/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/component/agent/pom.xml
@@ -152,4 +152,4 @@
     </repository>
   </repositories>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/connectedcup/component/analytics/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/analytics/pom.xml
index 4cfbfa21..3d0bf36c 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/analytics/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/component/analytics/pom.xml
@@ -90,4 +90,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/connectedcup/component/api/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/api/pom.xml
index 4516a402..448654e3 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/api/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/component/api/pom.xml
@@ -159,4 +159,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/connectedcup/component/ui/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/ui/pom.xml
index 84ee9a99..d4118711 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/ui/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/component/ui/pom.xml
@@ -60,4 +60,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/sampledevice/component/analytics/pom.xml b/modules/distribution/src/core/samples/sampledevice/component/analytics/pom.xml
index ac49be9f..e032eaa4 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/analytics/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/component/analytics/pom.xml
@@ -85,4 +85,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/sampledevice/component/api/pom.xml b/modules/distribution/src/core/samples/sampledevice/component/api/pom.xml
index 1faaeddd..981c1cd5 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/api/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/component/api/pom.xml
@@ -140,4 +140,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/sampledevice/component/plugin/pom.xml b/modules/distribution/src/core/samples/sampledevice/component/plugin/pom.xml
index 85dac1f5..955c0641 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/plugin/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/component/plugin/pom.xml
@@ -130,4 +130,4 @@
             <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/sampledevice/component/pom.xml b/modules/distribution/src/core/samples/sampledevice/component/pom.xml
index 5db33568..4bf75885 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/component/pom.xml
@@ -54,4 +54,4 @@
         <module>ui</module>
         <module>analytics</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/sampledevice/component/ui/pom.xml b/modules/distribution/src/core/samples/sampledevice/component/ui/pom.xml
index 9913c380..239260e1 100644
--- a/modules/distribution/src/core/samples/sampledevice/component/ui/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/component/ui/pom.xml
@@ -53,4 +53,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/sampledevice/feature/feature/pom.xml b/modules/distribution/src/core/samples/sampledevice/feature/feature/pom.xml
index fd66b5e4..497be7bc 100644
--- a/modules/distribution/src/core/samples/sampledevice/feature/feature/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/feature/feature/pom.xml
@@ -210,4 +210,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/sampledevice/feature/pom.xml b/modules/distribution/src/core/samples/sampledevice/feature/pom.xml
index 094774f5..832604e3 100644
--- a/modules/distribution/src/core/samples/sampledevice/feature/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/feature/pom.xml
@@ -32,4 +32,4 @@
     <modules>
         <module>feature</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/distribution/src/core/samples/sampledevice/pom.xml b/modules/distribution/src/core/samples/sampledevice/pom.xml
index 4d6de36d..6e833bb1 100644
--- a/modules/distribution/src/core/samples/sampledevice/pom.xml
+++ b/modules/distribution/src/core/samples/sampledevice/pom.xml
@@ -412,4 +412,4 @@
         <carbon.analytics.common.version>5.1.5</carbon.analytics.common.version>
         <carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/features/org.wso2.iot.core.styles.feature/pom.xml
index e31a6491..25f4b147 100644
--- a/modules/features/org.wso2.iot.core.styles.feature/pom.xml
+++ b/modules/features/org.wso2.iot.core.styles.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-features</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 4a0a7301..1cc5e108 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index be6d6ee0..f168d9db 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml
index 5b7fc9b9..313cee73 100644
--- a/modules/integration/tests-common/integration-common/pom.xml
+++ b/modules/integration/tests-common/integration-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>tests-common</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 714dbff1..b631a88e 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-integration</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/web-ui-pages/pom.xml b/modules/integration/tests-common/web-ui-pages/pom.xml
index 57ebf651..e0037757 100644
--- a/modules/integration/tests-common/web-ui-pages/pom.xml
+++ b/modules/integration/tests-common/web-ui-pages/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>tests-common</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index 044feb65..dc7e930f 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-integration</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
index d40aca98..c1e9ace3 100644
Binary files a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks and b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks differ
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2certs.jks b/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2certs.jks
index d40aca98..c1e9ace3 100644
Binary files a/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2certs.jks and b/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2certs.jks differ
diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml
index 49d31d84..41158ee3 100644
--- a/modules/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-integration</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks
index d40aca98..c1e9ace3 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks differ
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks
index d40aca98..c1e9ace3 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks differ
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index 697676a8..77c41957 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml
index 2d155d3f..6760c1b6 100644
--- a/modules/p2-profile/broker-profile/pom.xml
+++ b/modules/p2-profile/broker-profile/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index ab9e35cb..89fba028 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml
index 06373013..0bc873c5 100644
--- a/modules/p2-profile/pom.xml
+++ b/modules/p2-profile/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml
index a15fde08..8e08b762 100644
--- a/modules/scripts/mobile-qsg/pom.xml
+++ b/modules/scripts/mobile-qsg/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-scripts</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mobile-qsg</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.0-update10-SNAPSHOT</version>
     <name>WSO2 IoT - QSG Script</name>
     <description>This includes the tools for IoTs Quick Start Guide</description>
     <packaging>jar</packaging>
diff --git a/modules/scripts/pom.xml b/modules/scripts/pom.xml
index d579eacd..4ecab233 100644
--- a/modules/scripts/pom.xml
+++ b/modules/scripts/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml
index 8ec6c14b..091b8be3 100644
--- a/modules/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-tools</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-devicetype-archetype</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.0-update10-SNAPSHOT</version>
     <name>WSO2 IoT - Device Type Archetype</name>
     <description>WSO2 IoT Device Type Archetype</description>
     <packaging>maven-archetype</packaging>
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml
index c15ef204..c0004416 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml
@@ -83,4 +83,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/pom.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/pom.xml
index 72b48405..b8404f5a 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/pom.xml
@@ -170,4 +170,4 @@
 			<scope>provided</scope>
         </dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml
index cf34e955..8839d208 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml
@@ -130,4 +130,4 @@
             <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/pom.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/pom.xml
index ef3153f1..66e9c045 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/pom.xml
@@ -47,4 +47,4 @@
             </plugins>
         </pluginManagement>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/pom.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/pom.xml
index bf0fb9a1..054f4f16 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/pom.xml
@@ -53,4 +53,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
index b3bcd521..d9454bb5 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
@@ -209,4 +209,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/pom.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/pom.xml
index b02577bb..ea7cfea4 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/pom.xml
@@ -28,4 +28,4 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <version>${version}</version>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
index 7bc3825d..8d3c70cd 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
@@ -428,4 +428,4 @@
         <wso2.iot.version>1.0.0-SNAPSHOT</wso2.iot.version>
         <h2-database-engine>1.2.140.wso2v3</h2-database-engine>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 55dc1ad3..a6a447dd 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.1.0-update10-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index fc4c4f69..8f43cd78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.wso2.iot</groupId>
     <artifactId>wso2iot-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.1.0-update10-SNAPSHOT</version>
     <name>WSO2 IoT - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 IoT Server</description>
@@ -1517,14 +1517,14 @@
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.0.196</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.199</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.108</carbon.device.mgt.plugin.version>
+	    <carbon.device.mgt.plugin.version>4.0.111</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>