diff --git a/modules/core/distribution/src/repository/conf/app-manager.xml b/modules/core/distribution/src/repository/conf/app-manager.xml
index 106046b4..246b410d 100644
--- a/modules/core/distribution/src/repository/conf/app-manager.xml
+++ b/modules/core/distribution/src/repository/conf/app-manager.xml
@@ -414,14 +414,13 @@
                 MDM running on separate JVM. Calls MDM methods via secured REST API. Use this when run Store/Publisher/MDM
                 in deployed in separate JVMs. This will be the most suitable active MDM when deployed on production environment.
             -->
-            <MDM name="WSO2MDM" bundle="org.wso2.carbon.appmgt.mdm.restconnector">
+            <MDM name="WSO2MDM_EXTERNAL_REST" bundle="org.wso2.carbon.appmgt.mdm.restconnector">
                 <Property name="ImageURL">/store/extensions/assets/mobileapp/resources/models/%s.png</Property>
-                <Property name="ServerURL">https://localhost:9443/mdm-admin</Property>
-                <Property name="TokenApiURL">https://localhost:9443/oauth2/token</Property>
-                <Property name="ClientKey">WjLm24IxBVLF0oz0VJfmtJbjJbka</Property>
-                <Property name="ClientSecret">v3KkIQXkJ1SDp_Bf8uUQxu5p7TQa</Property>
-                <Property name="AuthUser">admin</Property>
-                <Property name="AuthPass">admin</Property>
+                <Property name="ServerURL">https://localhost:9443</Property>
+                <Property name="TokenApiURL">https://localhost:9443/oauth2</Property>
+                <property name="Username">admin</property>
+                <property name="Password">admin</property>
+                <property name="TokenRefreshTimeOffset">100</property>
             </MDM>
 
             <!-- Old EMM, Calls EMM using REST API -->
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 9506c72d..2fc8a8bb 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -429,6 +429,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.osgiconnector.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.restconnector.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                                 <!-- Mobile Device Management Features END -->
 
                                 <!-- APPM Features -->
@@ -456,9 +459,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.restconnector.feature:${appmgt.feature.version}
-                                </featureArtifactDef>
                                 <!-- APPM Features END -->
 
                                 <!-- Dashboards Features -->
@@ -835,6 +835,10 @@
                                     <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- End of Mobile Features -->
 
                                 <!-- App management features-->
@@ -850,10 +854,6 @@
                                     <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -1568,10 +1568,6 @@
                                     <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -1584,6 +1580,10 @@
                                     <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- End of app management features-->
                                 <feature>
                                     <id>org.apache.axis2.transport.mail.feature.group</id>
@@ -1973,10 +1973,6 @@
                                     <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -1989,6 +1985,10 @@
                                     <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- End of app management features-->
                                 <feature>
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
@@ -2457,10 +2457,6 @@
                                     <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -2473,6 +2469,10 @@
                                     <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- End of app management features-->
 
 								<!-- Dashboard Features -->
@@ -3115,10 +3115,6 @@
                                     <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -3131,6 +3127,10 @@
                                     <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- End of app management features-->
 
                                 <!-- Device Management Features -->
diff --git a/pom.xml b/pom.xml
index f4d295b3..94a44b07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1540,7 +1540,7 @@
         <carbon.governance.version>4.7.0</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.11</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.13</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1654,7 +1654,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.14</appmgt.feature.version>
+        <appmgt.feature.version>1.2.15</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.4.4</carbon.store.version>