diff --git a/modules/distribution/iot-community/pom.xml b/modules/distribution/iot-community/pom.xml
index 83905df..9c3abd8 100644
--- a/modules/distribution/iot-community/pom.xml
+++ b/modules/distribution/iot-community/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>io.entgra.community</groupId>
-        <artifactId>entgra-iot-distribution</artifactId>
+        <artifactId>distribution</artifactId>
         <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/modules/distribution/iot-core/pom.xml b/modules/distribution/iot-core/pom.xml
index 1a5fce8..c40c7e4 100644
--- a/modules/distribution/iot-core/pom.xml
+++ b/modules/distribution/iot-core/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>io.entgra.community</groupId>
-        <artifactId>entgra-iot-distribution</artifactId>
+        <artifactId>distribution</artifactId>
         <version>5.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index ef959e9..2335528 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>entgra-iot-distribution</artifactId>
+    <artifactId>distribution</artifactId>
     <packaging>pom</packaging>
     <name>Entgra IoT - Distribution Module</name>
     <description>Entgra IoT Distribution Module</description>
diff --git a/pom.xml b/pom.xml
index d115ee6..df83ed4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,14 +105,14 @@
         <entgra-iot-community>entgra-iot-community-${project.version}</entgra-iot-community>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>4.1.16-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>5.0.0-SNAPSHOT</carbon.device.mgt.version>
 
         <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
 
         <!--Orbit versions-->
         <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
 
-        <carbon.device.mgt.plugin.version>5.0.16-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>6.0.0-SNAPSHOT</carbon.device.mgt.plugin.version>
 
 
     </properties>