diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 148b7888..de2bed56 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -315,6 +315,34 @@
                         </configuration>
                     </execution>
 
+                    <execution>
+                        <!-- Creating IOT Management schema -->
+                        <id>create-arduino-schema</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo message="########### Device Cloud H2 Schema ###########" />
+
+                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+                                <property name="userid" value="wso2carbon" />
+                                <property name="password" value="wso2carbon" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/ArduinoDM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
+                                    <!--fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberry.sql" /-->
+                                    <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_arduino.sql" />
+                                </sql>
+                                <echo message="##################### END ####################" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+
                     <execution>
                         <!-- Creating IOT Management schema -->
                         <id>create-raspberrypi-schema</id>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 3531ee41..300f2ef1 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -26,7 +26,7 @@
                 <exclude>**/client-truststore.jks</exclude>
                 <exclude>**/wso2carbon.jks</exclude>
                 <exclude>**/WSO2AM_DB.h2.db</exclude>
-                <exclude>**/FireAlarmDM_DB.h2.db</exclude>
+                <!--<exclude>**/FireAlarmDM_DB.h2.db</exclude>-->
                 <exclude>**/WSO2DM_DB.h2.db</exclude>
                 <exclude>**/conf/axis2/axis2_client.xml</exclude>
                 <exclude>**/conf/etc/launch.ini</exclude>
@@ -279,6 +279,7 @@
             <includes>
                 <include>devicecloud.war</include>
                 <include>firealarm.war</include>
+                <include>arduino.war</include>
                 <include>sensebot.war</include>
                 <include>raspberrypi.war</include>
                 <include>digitaldisplay.war</include>
@@ -634,14 +635,14 @@
             <fileMode>644</fileMode>
         </file>
 
-        <file>
-            <source>
-                target/wso2carbon-core-${carbon.kernel.version}/repository/database/FireAlarmDM_DB.h2.db
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
-            <destName>FireAlarmDM_DB.h2.db</destName>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+            <!--<source>-->
+                <!--target/wso2carbon-core-${carbon.kernel.version}/repository/database/FireAlarmDM_DB.h2.db-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
+            <!--<destName>FireAlarmDM_DB.h2.db</destName>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
         <!-- Copying H2 database related files corresponding to default Device management repository schema -->
 
diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index 602de15b..c4804ff1 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -119,6 +119,27 @@
             </definition>
         </datasource>
 
+        <datasource>
+            <name>ArduinoDM_DS</name>
+            <description>The datasource used for Arduino database</description>
+            <jndiConfig>
+                <name>jdbc/FireAlarmDM_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/ArduinoDM_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>SensebotDM_DS</name>
             <description>The datasource used for Sensebot database</description>
diff --git a/pom.xml b/pom.xml
index 572a1ef2..032f35fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -367,6 +367,11 @@
                 <artifactId>org.wso2.carbon.device.mgt.iot.firealarm.impl</artifactId>
                 <version>${carbon.iot.device.mgt.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.iot</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.arduino.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.iot</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.iot.digitaldisplay.impl</artifactId>