diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 33389254..4cc4049c 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -224,231 +224,7 @@
 							</tasks>
 						</configuration>
 					</execution>
-					<execution>
-						<!-- Creating Virtual Firealarm Plugin Management schema -->
-						<id>create-virtual-firealarm-plugin-mgt-schema</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo message="########### Create Virtual Firealarm plugin Management 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}/VirtualFireAlarmDM_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/virtual_firealarm/h2.sql"/>
-								</sql>
-								<echo message="##################### END ####################"/>
-							</tasks>
-						</configuration>
-					</execution>
-					<execution>
-						<!-- Creating Android Sense Plugin Management schema -->
-						<id>create-android-sense-plugin-mgt-schema</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-
-								<echo message="########### Create Android Sense plugin Management 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}/AndroidSenseDM_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/android_sense/h2.sql"/>
-								</sql>
-								<echo message="##################### END ####################"/>
-							</tasks>
-						</configuration>
-					</execution>
-
-					<execution>
-						<!-- Creating Digital Display Plugin Management schema -->
-						<id>create-digital-display-plugin-mgt-schema</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo message="########### Create Digital Display plugin Management 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}/DigitalDisplayDM_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/digital_display/h2.sql"/>
-								</sql>
-								<echo message="##################### END ####################"/>
-							</tasks>
-						</configuration>
-					</execution>
-					<execution>
-						<!-- Creating Drone Analyzer Plugin Management schema -->
-						<id>create-drone-analyzer-plugin-mgt-schema</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo message="########### Create Drone Analyser plugin Management 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}/DroneAnalyzerDM_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/drone_analyzer/h2.sql"/>
-								</sql>
-								<echo message="##################### END ####################"/>
-							</tasks>
-						</configuration>
-					</execution>
-
-					<execution>
-						<!-- Creating Arduino Plugin Management schema -->
-						<id>create-arduino-plugin-mgt-schema</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo message="########### Create Arduino plugin Management 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/arduino/h2.sql"/>
-								</sql>
-								<echo message="##################### END ####################"/>
-							</tasks>
-						</configuration>
-					</execution>
-
-					<execution>
-						<!-- Creating RaspberryPi Plugin Management schema -->
-						<id>create-raspberrypi-plugin-mgt-schema</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo message="########### Create RaspberryPi plugin Management 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}/RaspberryPiDM_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/raspberrypi/h2.sql"/>
-								</sql>
-								<echo message="##################### END ####################"/>
-							</tasks>
-						</configuration>
-					</execution>
 
-					<!--<execution>-->
-					<!--&lt;!&ndash; Creating IDP Management schema &ndash;&gt;-->
-					<!--<id>create-idp-mgt-schema</id>-->
-					<!--<phase>package</phase>-->
-					<!--<goals>-->
-					<!--<goal>run</goal>-->
-					<!--</goals>-->
-					<!--<configuration>-->
-					<!--<tasks>-->
-					<!--<echo message="########### Create IDP Management 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}/WSO2CARBON_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/identity/h2.sql"/>-->
-					<!--</sql>-->
-					<!--<echo message="##################### END ####################"/>-->
-					<!--</tasks>-->
-					<!--</configuration>-->
-					<!--</execution>-->
 					<execution>
 						<!-- Creating API Management schema -->
 						<id>create-api-mgt-schema</id>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 6a216834..583601b8 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1004,6 +1004,92 @@
             <destName>WSO2DM_DB.h2.db</destName>
             <fileMode>644</fileMode>
         </file>
+
+
+        <!-- Copying ANDROID SENSE H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>AndroidSenseDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+
+
+        <!-- Copying ARDUINO H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/ArduinoDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>ArduinoDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+
+
+        <!-- Copying DIGITAL DISPLAY H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DigitalDisplayDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>DigitalDisplayDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+
+
+        <!-- Copying DRONE ANALYZER H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DroneAnalyzerDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>DroneAnalyzerDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+
+
+        <!-- Copying RASPBERRY-PI H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/RaspberryPiDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>RaspberryPiDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+
+        <!-- Copying VIRTUAL-FIREALARM H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/VirtualFireAlarmDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>VirtualFireAlarmDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+
+        <!--&lt;!&ndash; Copying MOBILE-ANDROID H2 database &ndash;&gt;-->
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
+            <!--<destName>WSO2MobileAndroid_DB.h2.db</destName>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
+
+        <!--&lt;!&ndash; Copying MOBILE-WINDOWS H2 database &ndash;&gt;-->
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
+            <!--<destName>WSO2MobileAndroid_DB.h2.db</destName>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
+
         <file>
             <source>src/repository/conf/carbon.xml
             </source>