diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml
index 02d5a6b..65b4165 100644
--- a/p2-profile/pom.xml
+++ b/p2-profile/pom.xml
@@ -77,10 +77,10 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mobile.android.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>-->
                             </featureArtifacts>
                         </configuration>
@@ -99,11 +99,11 @@
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+                                    <id>io.entgra.device.mgt.plugins.mobile.android.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>-->
                             </features>
diff --git a/pom.xml b/pom.xml
index 0e692cb..0d52569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -369,7 +369,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>
diff --git a/uem-core/src/assembly/bin.xml b/uem-core/src/assembly/bin.xml
index 85563ce..f64e9db 100644
--- a/uem-core/src/assembly/bin.xml
+++ b/uem-core/src/assembly/bin.xml
@@ -104,10 +104,6 @@
             <source>src/core/keystores/client-truststore.jks</source>
             <outputDirectory>${entgra-uem-core}/repository/resources/security/</outputDirectory>
         </file>
-        <file>
-            <source>src/core/samples/device-plugins-deployer.xml</source>
-            <outputDirectory>${entgra-uem-core}/samples/</outputDirectory>
-        </file>
     </files>
 
     <dependencySets>
diff --git a/uem-core/src/core/samples/device-plugins-deployer.xml b/uem-core/src/core/samples/device-plugins-deployer.xml
deleted file mode 100644
index ccd107c..0000000
--- a/uem-core/src/core/samples/device-plugins-deployer.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<!--
-  ~ Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>org.wso2</groupId>
-        <artifactId>wso2</artifactId>
-        <version>1</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>io.entgra.community.uem</groupId>
-    <artifactId>iot-devicetype-feature-installation</artifactId>
-    <version>5.2.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Install Virtual Fire Alarm Device Types - IoT Core</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>5.1.2</version>
-                <executions>
-                    <execution>
-                        <id>2-p2-repo-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-repo-gen</goal>
-                        </goals>
-                        <configuration>
-                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
-                            <publishArtifacts>true</publishArtifacts>
-                            <publishArtifactRepository>true</publishArtifactRepository>
-                            <featureArtifacts>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
-                            </featureArtifacts>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>default-feature-install</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-profile-gen</goal>
-                        </goals>
-                        <configuration>
-                            <profile>default</profile>
-                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
-                            <destination>${basedir}/../repository/components</destination>
-                            <deleteOldProfileFiles>false</deleteOldProfileFiles>
-                            <features>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-                            </features>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>wso2.releases</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </pluginRepository>
-        <pluginRepository>
-            <id>wso2.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-        <pluginRepository>
-            <id>wso2-nexus</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-
-
-    <repositories>
-        <!-- Before adding ANYTHING in here, please start a discussion on the dev list.
-             Ideally the Axis2 build should only use Maven central (which is available
-             by default) and nothing else. We had troubles with other repositories in
-             the past. Therefore configuring additional repositories here should be
-             considered very carefully. -->
-        <repository>
-            <id>wso2-nexus</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-        <repository>
-            <id>wso2.releases</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-        <repository>
-            <id>wso2.snapshots</id>
-            <name>WSO2 Snapshot Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>entgra-nexus</id>
-            <name>Entgra internal Repository</name>
-            <url>http://nexus.entgra.io/repository/maven-public/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-        <repository>
-            <id>entgra.releases</id>
-            <name>Entgra internal Repository</name>
-            <url>http://nexus.entgra.io/repository/maven-releases/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-        <repository>
-            <id>entgra.snapshots</id>
-            <name>Entgra Snapshot Repository</name>
-            <url>http://nexus.entgra.io/repository/maven-snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-    <properties>
-		<!--This gets picked from the build properties, Do not change it-->
-        <carbon.device.mgt.plugin.version>6.0.16-SNAPSHOT</carbon.device.mgt.plugin.version>
-    </properties>
-</project>