diff --git a/modules/distribution/src/samples/android_sense/build.xml b/modules/distribution/src/samples/android_sense/build.xml
index 86b5be1a..5a21f172 100644
--- a/modules/distribution/src/samples/android_sense/build.xml
+++ b/modules/distribution/src/samples/android_sense/build.xml
@@ -9,16 +9,28 @@
         <mkdir dir="${db.dir}"/>
         <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/${data_source};DB_CLOSE_ON_EXIT=FALSE"/>
 
-        <sql driver="org.h2.Driver" url="${dbURL}" userid="${db.username}" password="${db.password}"  autocommit="true" onerror="continue">
+        <sql driver="org.h2.Driver" url="${dbURL}" userid="${db.username}" password="${db.password}" autocommit="true"
+             onerror="continue">
             <classpath>
                 <pathelement location="${lib.dir}/h2-database-engine_1.2.140.wso2v3.jar"/>
             </classpath>
             <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
         </sql>
+        <copy file="${db.dir}/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <insert path="/IoTDeviceTypeConfigManager[1]">
+                <![CDATA[
+    <IotDeviceTypeConfig type="${sample_type}">
+		<DatasourceName>jdbc/${data_source}</DatasourceName>
+	</IotDeviceTypeConfig>
+	            ]]>
+            </insert>
+        </xmltask>
+
     </target>
 
     <target name="deploy" depends="create-db">
-        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
@@ -31,6 +43,9 @@
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/arduino/build.xml b/modules/distribution/src/samples/arduino/build.xml
index 6c63b72d..66833477 100644
--- a/modules/distribution/src/samples/arduino/build.xml
+++ b/modules/distribution/src/samples/arduino/build.xml
@@ -15,10 +15,21 @@
             </classpath>
             <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
         </sql>
+        <copy file="${db.dir}/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <insert path="/IoTDeviceTypeConfigManager[1]">
+                <![CDATA[
+    <IotDeviceTypeConfig type="${sample_type}">
+		<DatasourceName>jdbc/${data_source}</DatasourceName>
+	</IotDeviceTypeConfig>
+	            ]]>
+            </insert>
+        </xmltask>
+
     </target>
 
     <target name="deploy" depends="create-db">
-        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
@@ -31,6 +42,9 @@
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/common.xml b/modules/distribution/src/samples/common.xml
index 73d852ac..a6581d69 100644
--- a/modules/distribution/src/samples/common.xml
+++ b/modules/distribution/src/samples/common.xml
@@ -1,5 +1,6 @@
 <project>
     <property name="lib.dir" value="../../repository/components/plugins"/>
+    <property name="iot.conf" value="../../repository/conf/iot/iot-config.xml"/>
     <property name="target.db.dir" value="../../repository/database"/>
     <property name="target.sketch.dir" value="../../repository/resources/sketches"/>
     <property name="target.unit.dir" value="../../repository/deployment/server/jaggeryapps/iotserver/units"/>
@@ -7,4 +8,11 @@
     <property name="db.password" value="wso2carbon"/>
     <property name="db.dir" value="database"/>
     <property name="db.type" value="h2"/>
+
+    <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask">
+        <classpath>
+            <pathelement location="../lib/xmltask.jar"/>
+        </classpath>
+    </taskdef>
+
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/digital_display/build.xml b/modules/distribution/src/samples/digital_display/build.xml
index 99644e9a..3dcf2620 100644
--- a/modules/distribution/src/samples/digital_display/build.xml
+++ b/modules/distribution/src/samples/digital_display/build.xml
@@ -15,10 +15,21 @@
             </classpath>
             <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
         </sql>
+        <copy file="${db.dir}/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <insert path="/IoTDeviceTypeConfigManager[1]">
+                <![CDATA[
+    <IotDeviceTypeConfig type="${sample_type}">
+		<DatasourceName>jdbc/${data_source}</DatasourceName>
+	</IotDeviceTypeConfig>
+	            ]]>
+            </insert>
+        </xmltask>
+
     </target>
 
     <target name="deploy" depends="create-db">
-        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
diff --git a/modules/distribution/src/samples/firealarm/build.xml b/modules/distribution/src/samples/firealarm/build.xml
index f5bfe333..654ee855 100644
--- a/modules/distribution/src/samples/firealarm/build.xml
+++ b/modules/distribution/src/samples/firealarm/build.xml
@@ -15,10 +15,22 @@
             </classpath>
             <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
         </sql>
+        <copy file="${db.dir}/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <insert path="/IoTDeviceTypeConfigManager[1]">
+                <![CDATA[
+    <IotDeviceTypeConfig type="${sample_type}">
+		<DatasourceName>jdbc/${data_source}</DatasourceName>
+		<ApiApplicationName>firealarm</ApiApplicationName>
+	</IotDeviceTypeConfig>
+	            ]]>
+            </insert>
+        </xmltask>
+
     </target>
 
     <target name="deploy" depends="create-db">
-        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
@@ -31,6 +43,9 @@
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/raspberrypi/build.xml b/modules/distribution/src/samples/raspberrypi/build.xml
index a4f3253b..903256b7 100644
--- a/modules/distribution/src/samples/raspberrypi/build.xml
+++ b/modules/distribution/src/samples/raspberrypi/build.xml
@@ -15,10 +15,21 @@
             </classpath>
             <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
         </sql>
+        <copy file="${db.dir}/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <insert path="/IoTDeviceTypeConfigManager[1]">
+                <![CDATA[
+    <IotDeviceTypeConfig type="${sample_type}">
+		<DatasourceName>jdbc/${data_source}</DatasourceName>
+	</IotDeviceTypeConfig>
+	            ]]>
+            </insert>
+        </xmltask>
+
     </target>
 
     <target name="deploy" depends="create-db">
-        <copy file="database/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
@@ -31,6 +42,9 @@
         <delete file="${target.db.dir}/${data_source}.h2.db"/>
         <delete dir="${target.sketch.dir}/${sample_type}"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/sensebot/build.xml b/modules/distribution/src/samples/sensebot/build.xml
index b771e1da..6a5b35fd 100644
--- a/modules/distribution/src/samples/sensebot/build.xml
+++ b/modules/distribution/src/samples/sensebot/build.xml
@@ -14,10 +14,21 @@
             </classpath>
             <fileset file="dbscripts/${db.type}_${sample_type}.sql"/>
         </sql>
+        <copy file="${db.dir}/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
+
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <insert path="/IoTDeviceTypeConfigManager[1]">
+                <![CDATA[
+    <IotDeviceTypeConfig type="${sample_type}">
+		<DatasourceName>jdbc/${data_source}</DatasourceName>
+	</IotDeviceTypeConfig>
+	            ]]>
+            </insert>
+        </xmltask>
+
     </target>
 
     <target name="deploy" depends="create-db">
-        <copy file="${db.dir}/${data_source}.h2.db" toDir="${target.db.dir}" overwrite="yes"/>
         <copy toDir="${target.sketch.dir}/${sample_type}">
             <fileset dir="sketch"/>
         </copy>
@@ -34,6 +45,9 @@
         <delete dir="${target.sketch.dir}/${sample_type}"/>
         <delete dir="${target.sketch.dir}/${sample_type}_wifi"/>
         <delete dir="${target.unit.dir}/${sample_type}"/>
+        <xmltask source="${iot.conf}" dest="${iot.conf}" report="true">
+            <remove path="/IoTDeviceTypeConfigManager/IotDeviceTypeConfig[type='${sample_type}']"/>
+        </xmltask>
     </target>
 
 </project>
\ No newline at end of file