diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml
index 7a3963fbd..73ca22243 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/conf/mobile-config.xml
@@ -19,7 +19,7 @@
     <ManagementRepository>
         <DataSourceConfiguration>
             <JndiLookupDefinition>
-                <Name>jdbc/WSO2MOBILE_DB</Name>
+                <Name>jdbc/MOBILE_MGT_DS</Name>
             </JndiLookupDefinition>
         </DataSourceConfiguration>
     </ManagementRepository>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
index 1f7bca1d9..87176d638 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
@@ -18,7 +18,7 @@
     <ManagementRepository>
         <DataSourceConfiguration>
             <JndiLookupDefinition>
-                <Name>jdbc/WSO2DEVICE_DB</Name>
+                <Name>jdbc/DEVICE_MGT_DS</Name>
             </JndiLookupDefinition>
         </DataSourceConfiguration>
     </ManagementRepository>
diff --git a/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml b/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
index 7b02df9cd..0797b85da 100755
--- a/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
+++ b/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
@@ -5,14 +5,14 @@
 
     <datasources>
         <datasource>
-            <name>WSO2DEVICE_DB</name>
+            <name>DEVICE_MGT_DS</name>
             <description>The datasource used for CDM</description>
             <jndiConfig>
-                <name>jdbc/WSO2DEVICE_DB</name>
+                <name>jdbc/DEVICE_MGT_DS</name>
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/WSO2DEVICE_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <url>jdbc:h2:repository/database/WSO2DEVICEMGT_DB;DB_CLOSE_ON_EXIT=FALSE</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
@@ -25,10 +25,10 @@
             </definition>
         </datasource>
         <datasource>
-            <name>WSO2MOBILE_DB</name>
+            <name>MOBILE_MGT_DS</name>
             <description>The datasource used for CDM Mobile Device Management</description>
             <jndiConfig>
-                <name>jdbc/WSO2MOBILE_DB</name>
+                <name>jdbc/MOBILE_MGT_DS</name>
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
@@ -44,5 +44,25 @@
                 </configuration>
             </definition>
         </datasource>
+	<datasource>
+            <name>WSO2DEVICE_DB</name>
+            <description>The datasource used for CDM</description>
+            <jndiConfig>
+                <name>jdbc/WSO2AM_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
     </datasources>
 </datasources-configuration>