diff --git a/modules/samples/connectedcup/pom.xml b/modules/samples/connectedcup/pom.xml
index 2924682a..17d4bf9c 100644
--- a/modules/samples/connectedcup/pom.xml
+++ b/modules/samples/connectedcup/pom.xml
@@ -372,10 +372,8 @@
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
-        <carbon.device.mgt.plugin.version>2.1.0</carbon.device.mgt.plugin.version>
-        <carbon.iot.device.mgt.jar.version>2.1.0</carbon.iot.device.mgt.jar.version>
+        <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
diff --git a/modules/samples/connectedlap/pom.xml b/modules/samples/connectedlap/pom.xml
index 736e66c9..13f13ca6 100644
--- a/modules/samples/connectedlap/pom.xml
+++ b/modules/samples/connectedlap/pom.xml
@@ -380,8 +380,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/currentsensor/pom.xml b/modules/samples/currentsensor/pom.xml
index fb8f58bd..5a791f4b 100644
--- a/modules/samples/currentsensor/pom.xml
+++ b/modules/samples/currentsensor/pom.xml
@@ -166,7 +166,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.webapp.publisher_${carbon.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.webapp.publisher_${carbon.device.mgt.version}.jar
                 </systemPath>
             </dependency>
 
@@ -185,7 +185,7 @@
                 <version>${carbon.device.mgt.plugin.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot_${carbon.iot.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot_${carbon.device.mgt.plugin.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -194,7 +194,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.core_${carbon.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.core_${carbon.device.mgt.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -203,7 +203,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.common_${carbon.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.common_${carbon.device.mgt.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -212,7 +212,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.certificate.mgt.core_${carbon.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.certificate.mgt.core_${carbon.device.mgt.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -221,7 +221,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.annotations_${carbon.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.annotations_${carbon.device.mgt.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -230,7 +230,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.analytics.data.publisher_${carbon.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.analytics.data.publisher_${carbon.device.mgt.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -351,7 +351,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.extensions_${carbon.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.extensions_${carbon.device.mgt.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -360,16 +360,16 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.application.extension_${carbon.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.application.extension_${carbon.device.mgt.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
-                <version>${carbon.device.mgt.jar.version}</version>
+                <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.identity.jwt.client.extension_${carbon.device.mgt.jar.version}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.identity.jwt.client.extension_${carbon.device.mgt.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -388,11 +388,9 @@
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
-        <carbon.iot.device.mgt.jar.version>2.2.0</carbon.iot.device.mgt.jar.version>
+        <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
 
-        <carbon.device.mgt.jar.version>1.1.0.SNAPSHOT</carbon.device.mgt.jar.version>
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
         <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
diff --git a/modules/samples/digitaldisplay/pom.xml b/modules/samples/digitaldisplay/pom.xml
index f10fa76c..2363b715 100644
--- a/modules/samples/digitaldisplay/pom.xml
+++ b/modules/samples/digitaldisplay/pom.xml
@@ -463,8 +463,8 @@
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
diff --git a/modules/samples/doormanager/pom.xml b/modules/samples/doormanager/pom.xml
index 4c9bdd3c..1fb76b3e 100644
--- a/modules/samples/doormanager/pom.xml
+++ b/modules/samples/doormanager/pom.xml
@@ -390,8 +390,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/droneanalyzer/pom.xml b/modules/samples/droneanalyzer/pom.xml
index 9cbc581c..e78814f2 100644
--- a/modules/samples/droneanalyzer/pom.xml
+++ b/modules/samples/droneanalyzer/pom.xml
@@ -380,8 +380,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/firealarm/pom.xml b/modules/samples/firealarm/pom.xml
index 6f97460b..4b5fceda 100644
--- a/modules/samples/firealarm/pom.xml
+++ b/modules/samples/firealarm/pom.xml
@@ -380,8 +380,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/geolocationTracker/pom.xml b/modules/samples/geolocationTracker/pom.xml
index caa0f26b..9be9fd3d 100644
--- a/modules/samples/geolocationTracker/pom.xml
+++ b/modules/samples/geolocationTracker/pom.xml
@@ -380,8 +380,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/watertank/pom.xml b/modules/samples/watertank/pom.xml
index 6d0c47ba..f616d794 100644
--- a/modules/samples/watertank/pom.xml
+++ b/modules/samples/watertank/pom.xml
@@ -371,8 +371,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>