diff --git a/modules/distribution/src/samples-deployer.xml b/modules/distribution/src/samples-deployer.xml
index 80bdb599..6ad04063 100644
--- a/modules/distribution/src/samples-deployer.xml
+++ b/modules/distribution/src/samples-deployer.xml
@@ -185,7 +185,7 @@
     </build>
 
     <properties>
-        <carbon.device.mgt.plugin.version>2.2.2-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
     </properties>
 
     <pluginRepositories>
diff --git a/modules/samples/connectedcup/pom.xml b/modules/samples/connectedcup/pom.xml
index 17d4bf9c..ea0d1512 100644
--- a/modules/samples/connectedcup/pom.xml
+++ b/modules/samples/connectedcup/pom.xml
@@ -372,8 +372,8 @@
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
 
         <!-- Carbon Device Management -->
-        <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.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.3-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 13f13ca6..348a5d32 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.1-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.3-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 5a791f4b..5124b9f7 100644
--- a/modules/samples/currentsensor/pom.xml
+++ b/modules/samples/currentsensor/pom.xml
@@ -388,8 +388,8 @@
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
 
         <!-- Carbon Device Management -->
-        <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.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.3-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/digitaldisplay/pom.xml b/modules/samples/digitaldisplay/pom.xml
index 2363b715..c7ff2152 100644
--- a/modules/samples/digitaldisplay/pom.xml
+++ b/modules/samples/digitaldisplay/pom.xml
@@ -195,7 +195,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.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -463,14 +463,12 @@
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
 
         <!-- Carbon Device Management -->
-        <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.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.3-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>
         <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
-        <carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
-        <carbon.iot.device.mgt.jar.version>2.1.0.SNAPSHOT</carbon.iot.device.mgt.jar.version>
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!--XMPP/MQTT Version-->
diff --git a/modules/samples/doormanager/pom.xml b/modules/samples/doormanager/pom.xml
index 1fb76b3e..b46bd46a 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.1-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.3-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 e78814f2..7187db4e 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.1-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.3-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 4b5fceda..5ebd8fae 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.1-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.3-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 9be9fd3d..2d8c805e 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.1-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.3-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 f616d794..67453059 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.1-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.2.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.3-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/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 4037da42..7bc3825d 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
@@ -381,7 +381,7 @@
         <carbon.devicemgt.version>1.1.0-SNAPSHOT</carbon.devicemgt.version>
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
-        <carbon.device.mgt.version>1.1.0-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.jar.version>1.1.0.SNAPSHOT</carbon.device.mgt.jar.version>
         <carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
         <carbon.iot.device.mgt.jar.version>2.1.0.SNAPSHOT</carbon.iot.device.mgt.jar.version>
@@ -394,7 +394,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
         <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
         <smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>
-        <carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
         <cxf.version>2.6.1</cxf.version>
         <jackson.version>1.9.0</jackson.version>
         <javaee-web-api.version>6.0</javaee-web-api.version>