diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/build.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/build.xml
index a7c8ca4ff..605ff3f52 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/build.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/build.xml
@@ -31,6 +31,9 @@
             <zipfileset
                     dir="target/"
                     includes="JavaApp.jar" fullpath="JavaApp.jar"/>
+            <zipfileset
+                    dir="target/"
+                    includes="client-debug.apk" fullpath="resources/client-debug.apk"/>
             <zipfileset dir="${src-dir}/" includes="startEmulator.sh" filemode="755"/>
             <zipfileset dir="${src-dir}"/>
         </zip>
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 fcc138de7..fcb88138b 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
@@ -33,6 +33,19 @@
     <name>WSO2 Carbon - Mobile Android UI</name>
     <packaging>pom</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>io.entgra.emm</groupId>
+            <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>
         <plugins>
             <plugin>
@@ -56,6 +69,24 @@
                                     </outputDirectory>
                                     <destFileName>JavaApp.jar</destFileName>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>io.entgra.emm</groupId>
+                                    <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>android-agent.apk</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>io.entgra.emm</groupId>
+                                    <artifactId>io.entgra.emm.android.agent.debug</artifactId>
+                                    <type>apk</type>
+                                    <version>${android.agent.version}</version>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.basedir}/target/</outputDirectory>
+                                    <destFileName>client-debug.apk</destFileName>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/assembly/src.xml b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/assembly/src.xml
index 789a0e681..65d67813e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/assembly/src.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/assembly/src.xml
@@ -42,5 +42,13 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
+        <file>
+            <source>
+                ${basedir}/target/android-agent.apk
+            </source>
+            <outputDirectory>/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
     </files>
 </assembly>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/resources/client-debug.apk b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/resources/client-debug.apk
deleted file mode 100644
index 46d45da13..000000000
Binary files a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/resources/client-debug.apk and /dev/null differ
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/.gitignore b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk
deleted file mode 100644
index 91c775a77..000000000
Binary files a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 0353af774..74ae8dd37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1186,6 +1186,18 @@
                 <artifactId>feign-okhttp</artifactId>
                 <version>${github.openfeign.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.entgra.emm</groupId>
+                <artifactId>io.entgra.emm.android.agent.release</artifactId>
+                <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>
         </dependencies>
     </dependencyManagement>
 
@@ -1239,6 +1251,9 @@
         <!-- Carbon Device Management Plugins -->
         <carbon.devicemgt.plugins.version>4.2.6-SNAPSHOT</carbon.devicemgt.plugins.version>
 
+        <!-- Android Agent Artifact Version-->
+        <android.agent.version>3.6.0</android.agent.version>
+
         <!-- Carbon Commons -->
         <carbon.commons.version>4.6.21</carbon.commons.version>