diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
index 83f971d3f..d522c9f6a 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java
@@ -46,8 +46,8 @@ class Constants {
     static final String DOWNLOADED_PLATFORM_NAME = "downloaded.platform.name";
     static final String TARGET_VERSION = "target.version";
     static final String OS_TARGET = "os.target";
-    // WSO2 AVD specific variables
+    // Entgra AVD specific variables
     static final String WSO2_AVD_NAME = "ENTGRA_AVD";
-    static final String APK_LOCATION = File.separator + "resources" + File.separator + "client-debug.apk";
+    static final String APK_LOCATION = File.separator + "resources" + File.separator + "android-agent.apk";
     static final String WSO2_CONFIG_LOCATION = File.separator + "resources" + File.separator + "config.ini";
 }
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
index ed8ce3c6b..7ad6dfc93 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>io.entgra.emm.android.agent.release</artifactId>
             <type>apk</type>
         </dependency>
-        <dependency>
-            <groupId>io.entgra.emm</groupId>
-            <artifactId>io.entgra.emm.android.agent.debug</artifactId>
-            <type>apk</type>
-        </dependency>
     </dependencies>
 
     <build>
@@ -79,12 +74,12 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>io.entgra.emm</groupId>
-                                    <artifactId>io.entgra.emm.android.agent.debug</artifactId>
+                                    <artifactId>io.entgra.emm.android.agent.release</artifactId>
                                     <type>apk</type>
                                     <version>${android.agent.version}</version>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${project.basedir}/target/</outputDirectory>
-                                    <destFileName>client-debug.apk</destFileName>
+                                    <destFileName>android-agent.apk</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index 64b5ae116..08954b906 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1143,12 +1143,6 @@
                 <type>apk</type>
                 <version>${android.agent.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.entgra.emm</groupId>
-                <artifactId>io.entgra.emm.android.agent.debug</artifactId>
-                <type>apk</type>
-                <version>${android.agent.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.apis</groupId>
                 <artifactId>google-api-services-androidenterprise</artifactId>
@@ -1167,7 +1161,7 @@
         <carbon.devicemgt.plugins.version>5.0.7-SNAPSHOT</carbon.devicemgt.plugins.version>
 
         <!-- Android Agent Artifact Version-->
-        <android.agent.version>4.0.3</android.agent.version>
+        <android.agent.version>4.0.0</android.agent.version>
 
         <!-- Java Version Compatibility -->
         <wso2.maven.compiler.source>1.8</wso2.maven.compiler.source>