diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 6e524874..47826d10 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -748,6 +748,29 @@
                 <include>**/*</include>
             </includes>
         </fileSet>
+
+        <!-- Files required to mobile-qsg -->
+        <fileSet>
+            <directory>../scripts/mobile-qsg/resources</directory>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/samples/mobile-qsg
+            </outputDirectory>
+            <includes>
+                <include>**/**</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>../scripts/mobile-qsg/target</directory>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <includes>
+                <include>**/**</include>
+            </includes>
+        </fileSet>
+        <!-- Files required to mobile-qsg -->
+
     </fileSets>
 
     <dependencySets>
@@ -1478,9 +1501,21 @@
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/theme/templates
             </outputDirectory>
-
         </file>
 
+        <!-- Copying mobile-qsg jar  -->
+        <file>
+            <source>../scripts/mobile-qsg/target/mobile-qsg.jar</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/samples/mobile-qsg
+            </outputDirectory>
+        </file>
+        <file>
+            <source>../scripts/mobile-qsg/target/org.wso2.carbon.appmgt.oauth.core-1.2.5.jar</source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/components/dropins
+            </outputDirectory>
+        </file>
 
     </files>
 </assembly>
diff --git a/modules/core/scripts/mobile-qsg/pom.xml b/modules/core/scripts/mobile-qsg/pom.xml
index 9310827a..944351b0 100644
--- a/modules/core/scripts/mobile-qsg/pom.xml
+++ b/modules/core/scripts/mobile-qsg/pom.xml
@@ -64,6 +64,72 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>download-appm-store.war</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <get src="http://maven.wso2.org/nexus/content/groups/wso2-public/org/wso2/carbon/appmgt/org.wso2.carbon.appmgt.rest.api.store/1.2.5/org.wso2.carbon.appmgt.rest.api.store-1.2.5.war"
+                                     dest="${project.build.directory}/api#appm#store#v1.1.war"
+                                     verbose="false"
+                                     usetimestamp="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>download-appm-publisher.war</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <get src="http://maven.wso2.org/nexus/content/groups/wso2-public/org/wso2/carbon/appmgt/org.wso2.carbon.appmgt.rest.api.publisher/1.2.5/org.wso2.carbon.appmgt.rest.api.publisher-1.2.5.war"
+                                     dest="${project.build.directory}/api#appm#publisher#v1.1.war"
+                                     verbose="false"
+                                     usetimestamp="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>download-appm-ouath-webapp.war</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <get src="http://maven.wso2.org/nexus/content/groups/wso2-public/org/wso2/carbon/appmgt/org.wso2.carbon.appmgt.oauth.webapp/1.2.5/org.wso2.carbon.appmgt.oauth.webapp-1.2.5.war"
+                                     dest="${project.build.directory}/api#appm#oauth#v1.0.war"
+                                     verbose="false"
+                                     usetimestamp="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>download-appm-ouath-core.jar</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <get src="http://maven.wso2.org/nexus/content/groups/wso2-public/org/wso2/carbon/appmgt/org.wso2.carbon.appmgt.oauth.core/1.2.5/org.wso2.carbon.appmgt.oauth.core-1.2.5.jar"
+                                     dest="${project.build.directory}/"
+                                     verbose="false"
+                                     usetimestamp="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
diff --git a/modules/core/scripts/mobile-qsg/resources/Readme.txt b/modules/core/scripts/mobile-qsg/resources/Readme.txt
index 36cf44c3..64ce0ece 100644
--- a/modules/core/scripts/mobile-qsg/resources/Readme.txt
+++ b/modules/core/scripts/mobile-qsg/resources/Readme.txt
@@ -1,10 +1,7 @@
-    IoTs 3.0.0 QSG Setup guide
-
-1. Navigate to this folder using the terminal, Note that this (Readme.txt) flie should be located under <IoTS_HOME>/core/samples/mobile-qsg/ directory.
-2. Stop the WSO2 IoTS if already runing
-3. Then execute the copy-files.sh script
-4. Start the WSO2 IoTS server
-5. Once server is started execute the mobile-qsg.sh script
-6. Then login to the https://<your-server>:9443/devicemgt/ and use the username,password as alex alex@IoTS, Note that for this sample we have configured above user from the script. If you want to run this script again you have to login as admin and remove the user alex, chris and role iotMobileUser from the IoT Server.
-
+    IoTs 3.1.0 QSG Setup guide
 
+1. Start the WSO2 IoTS server
+2. Navigate to <IoTS_HOME>/core/samples/mobile-qsg/ directory using the terminal.
+3. Once server is started execute the mobile-qsg.sh script
+4. Then login to the https://<your-server>:9443/devicemgt/ and use the username,password as alex alex@IoTS,
++Note that for this sample we have configured above user from the script. If you want to run this script again you have to login as admin and remove the user alex, chris and role iotMobileUser from the IoT Server.
\ No newline at end of file
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/catalog.apk b/modules/core/scripts/mobile-qsg/resources/apps/android/catalog.apk
new file mode 100644
index 00000000..473f5805
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/android/catalog.apk differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/banner.jpg b/modules/core/scripts/mobile-qsg/resources/apps/android/images/banner.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/android/images/banner.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/icon.jpg b/modules/core/scripts/mobile-qsg/resources/apps/android/images/icon.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/android/images/icon.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen1.jpg b/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen1.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen1.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen2.jpg b/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen2.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen2.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen3.jpg b/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen3.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen3.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/PNDemo.ipa b/modules/core/scripts/mobile-qsg/resources/apps/ios/PNDemo.ipa
new file mode 100644
index 00000000..01729c7c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/ios/PNDemo.ipa differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/banner.jpg b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/banner.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/banner.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/icon.jpg b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/icon.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/icon.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen1.jpg b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen1.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen1.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen2.jpg b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen2.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen2.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen3.jpg b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen3.jpg
new file mode 100644
index 00000000..002dea5c
Binary files /dev/null and b/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen3.jpg differ
diff --git a/modules/core/scripts/mobile-qsg/resources/copy-files.sh b/modules/core/scripts/mobile-qsg/resources/copy-files.sh
deleted file mode 100644
index 8bb28f16..00000000
--- a/modules/core/scripts/mobile-qsg/resources/copy-files.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# product-emm qsg sample setup script for copying the required files
-
-echo "Copying the required files for wso2iots-3.0.0 QSG setup ..."
-cp dropings/* ../../repository/components/dropins/ 
-cp webapps/* ../../repository/deployment/server/webapps/ 
-
-
diff --git a/modules/core/scripts/mobile-qsg/resources/mobile-qsg.sh b/modules/core/scripts/mobile-qsg/resources/mobile-qsg.sh
old mode 100644
new mode 100755
diff --git a/modules/core/scripts/mobile-qsg/resources/script_and_resources.zip b/modules/core/scripts/mobile-qsg/resources/script_and_resources.zip
deleted file mode 100644
index 383d8681..00000000
Binary files a/modules/core/scripts/mobile-qsg/resources/script_and_resources.zip and /dev/null differ
diff --git a/pom.xml b/pom.xml
index c6c24f53..cd7d955c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1535,7 +1535,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>2.0.18-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.20-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->