diff --git a/.gitignore b/.gitignore
index 77d46f4f28..9f6c8d177e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ target
 hs_err_pid*
 
 # Ignore generated capps
-carbonapps
+*.car
 
 # Ignore generated device-type DBs
 *.h2.db
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
index a158a46a20..35fd82d8f8 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/pom.xml
@@ -127,6 +127,8 @@
                                 <property name="dbURL"
                                           value="jdbc:h2:file:${basedir}/${db.dir}/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>
 
+                                <mkdir dir="${basedir}/${db.dir}"/>
+
                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
                                      password="${password}"
                                      autocommit="true" onerror="continue">
diff --git a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml
index 235e17c101..7a5e51aae2 100644
--- a/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml
+++ b/features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/pom.xml
@@ -142,6 +142,8 @@
 								<property name="dbURL"
 										  value="jdbc:h2:file:${basedir}/${db.dir}/ArduinoDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>
 
+                                <mkdir dir="${basedir}/${db.dir}"/>
+
 								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
 									 password="${password}"
 									 autocommit="true" onerror="continue">
diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/pom.xml b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/pom.xml
index f3b0c1ec80..336d8360c9 100644
--- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/pom.xml
+++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/pom.xml
@@ -128,6 +128,8 @@
                                 <property name="dbURL"
                                           value="jdbc:h2:file:${basedir}/${db.dir}/DigitalDisplayDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>
 
+                                <mkdir dir="${basedir}/${db.dir}"/>
+
                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
                                      password="${password}"
                                      autocommit="true" onerror="continue">
diff --git a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/pom.xml b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/pom.xml
index ddd195d147..b72740af74 100644
--- a/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/pom.xml
+++ b/features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/pom.xml
@@ -109,6 +109,8 @@
                                 <property name="dbURL"
                                           value="jdbc:h2:file:${basedir}/${db.dir}/DroneAnalyzerDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>
 
+                                <mkdir dir="${basedir}/${db.dir}"/>
+
                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
                                      password="${password}"
                                      autocommit="true" onerror="continue">
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml
index a3b2e2651d..a24c3bccc1 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/pom.xml
@@ -142,6 +142,8 @@
 								<property name="dbURL"
 										  value="jdbc:h2:file:${basedir}/${db.dir}/RaspberryPiDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>
 
+                                <mkdir dir="${basedir}/${db.dir}"/>
+
 								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
 									 password="${password}"
 									 autocommit="true" onerror="continue">
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml
index 332f9f6db1..4e36ca3363 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/pom.xml
@@ -185,6 +185,8 @@
 								<property name="dbURL"
 										  value="jdbc:h2:file:${basedir}/${db.dir}/VirtualFireAlarmDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>
 
+                                <mkdir dir="${basedir}/${db.dir}"/>
+
 								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
 									 password="${password}"
 									 autocommit="true" onerror="continue">
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
index fa751aa80a..12f71e5d3d 100644
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
@@ -124,6 +124,8 @@
                                 <property name="dbURL"
                                           value="jdbc:h2:file:${basedir}/${db.dir}/WSO2MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE"/>
 
+                                <mkdir dir="${basedir}/${db.dir}"/>
+
                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
                                      password="${password}"
                                      autocommit="true" onerror="continue">
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
index 4e49acde1a..d39702986f 100644
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
@@ -124,6 +124,8 @@
                                 <property name="dbURL"
                                           value="jdbc:h2:file:${basedir}/${db.dir}/WSO2MobileWindows_DB;DB_CLOSE_ON_EXIT=FALSE"/>
 
+                                <mkdir dir="${basedir}/${db.dir}"/>
+
                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
                                      password="${password}"
                                      autocommit="true" onerror="continue">