diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index d7c87f7b..9b7aad69 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -244,6 +244,7 @@
             </outputDirectory>
             <includes>
                 <include>**/master-datasources.xml</include>
+                <include>**/cdm-datasources.xml</include>
             </includes>
         </fileSet>
         <fileSet>
diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index 379eb715..e28aa690 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -84,25 +84,5 @@
                 </configuration>
             </definition>
         </datasource>
-        <datasource>
-            <name>DM_DS</name>
-            <description>The datasource used for CDM</description>
-            <jndiConfig>
-                <name>jdbc/DM_DS</name>
-            </jndiConfig>
-            <definition type="RDBMS">
-                <configuration>
-                    <url>jdbc:h2:repository/database/WSO2DM_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>
diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs
index 2b5c7c8c..d77a8d9a 100644
--- a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs
@@ -28,5 +28,5 @@
 </div>
 
 {{#zone "bottomJs"}}
-    {{js "js/devicetype-graph.js"}}
+    {{js "js/connectedcup.js"}}
 {{/zone}}