diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml
index 1a5a22b2..c26f0016 100644
--- a/modules/distribution/src/assembly/dist.xml
+++ b/modules/distribution/src/assembly/dist.xml
@@ -54,8 +54,8 @@
             <fileMode>755</fileMode>
         </fileSet>
         <fileSet>
-            <directory>src/resources/samples</directory>
-            <outputDirectory>wso2iot-${product.iot.version}/samples</outputDirectory>
+            <directory>src/resources/plugins</directory>
+            <outputDirectory>wso2iot-${product.iot.version}/plugins</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
diff --git a/modules/distribution/src/resources/samples/samples-deployer.xml b/modules/distribution/src/resources/plugins/plugins-deployer.xml
similarity index 94%
rename from modules/distribution/src/resources/samples/samples-deployer.xml
rename to modules/distribution/src/resources/plugins/plugins-deployer.xml
index 191087fa..5f783696 100644
--- a/modules/distribution/src/resources/samples/samples-deployer.xml
+++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml
@@ -63,6 +63,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -95,6 +98,10 @@
                                     <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>