diff --git a/iot-core/src/core/samples/device-plugins-deployer.xml b/iot-core/src/core/samples/device-plugins-deployer.xml
index 4cd4d7f..371e265 100644
--- a/iot-core/src/core/samples/device-plugins-deployer.xml
+++ b/iot-core/src/core/samples/device-plugins-deployer.xml
@@ -51,7 +51,7 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature:${carbon.device.mgt.plugin.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
@@ -70,7 +70,7 @@
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group</id>
+                                    <id>io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                             </features>
diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml
index aae67c0..f86fc37 100644
--- a/p2-profile/pom.xml
+++ b/p2-profile/pom.xml
@@ -66,7 +66,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                                    <groupId>io.entgra.device.mgt.plugins</groupId>
                                     <artifactId>io.entgra.device.mgt.plugins.emqx.exhook</artifactId>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                     <type>jar</type>
@@ -88,7 +88,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                                    <groupId>io.entgra.device.mgt.plugins</groupId>
                                     <artifactId>io.entgra.device.mgt.plugins.emqx.initializer</artifactId>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                     <type>jar</type>
@@ -120,19 +120,19 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.adapter.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.notification.listener.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.device.feature:${carbon.device.mgt.plugin.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.device.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.analytics.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
@@ -151,23 +151,23 @@
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
+                                    <id>io.entgra.device.mgt.plugins.adapter.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
+                                    <id>io.entgra.device.mgt.plugins.notification.listener.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.extension.siddhi.device.feature.group</id>
+                                    <id>io.entgra.device.mgt.plugins.extension.siddhi.device.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
+                                    <id>io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
+                                    <id>io.entgra.device.mgt.plugins.analytics.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                             </features>
diff --git a/pom.xml b/pom.xml
index aac9fd3..dabced2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -370,7 +370,7 @@
         <!--Orbit versions-->
         <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
 
-        <carbon.device.mgt.plugin.version>6.0.16</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>6.0.17-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!--Testing-->
         <google.gson.version>2.8.5</google.gson.version>