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 381ad434a..1f7bca1d9 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>WSO2DEVICE_DB</Name>
+                <Name>jdbc/WSO2DEVICE_DB</Name>
             </JndiLookupDefinition>
         </DataSourceConfiguration>
     </ManagementRepository>
diff --git a/product/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/product/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index a16e93a69..da376108c 100755
--- a/product/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/product/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -4,26 +4,6 @@
     </providers>
 
     <datasources>
-        <datasource>
-            <name>WSO2DEVICE_DB</name>
-            <description>The datasource used for EMM</description>
-            <jndiConfig>
-                <name>jdbc/WSO2DEVICE_DB</name>
-            </jndiConfig>
-            <definition type="RDBMS">
-                <configuration>
-                    <url>jdbc:h2:repository/database/WSO2DEVICE_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>
         <datasource>
             <name>WSO2_CARBON_DB</name>
             <description>The datasource used for registry and user manager</description>