diff --git a/modules/distribution/src/analytics/conf/ds_config.xml b/modules/distribution/src/analytics/conf/ds_config.xml
index 3f0d90f4..39304210 100644
--- a/modules/distribution/src/analytics/conf/ds_config.xml
+++ b/modules/distribution/src/analytics/conf/ds_config.xml
@@ -8,7 +8,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:../../repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095</url>
+                    <url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 9e0bf96d..a92e18f4 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -700,6 +700,13 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/database</outputDirectory>
         </fileSet>
 
+        <fileSet>
+            <directory>
+                ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/database
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/database</outputDirectory>
+        </fileSet>
+
         <fileSet>
             <directory>../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/lib</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/lib</outputDirectory>
@@ -911,6 +918,14 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/database</outputDirectory>
         </fileSet>
 
+        <fileSet>
+            <directory>
+                ../p2-profile/broker-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/database
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/database</outputDirectory>
+        </fileSet>
+
+
         <fileSet>
             <directory>../p2-profile/broker-profile/target/wso2carbon-core-${carbon.kernel.version}/lib</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/lib</outputDirectory>
diff --git a/modules/distribution/src/broker/conf/datasources/master-datasources.xml b/modules/distribution/src/broker/conf/datasources/master-datasources.xml
index c36b7eb4..8825cf02 100644
--- a/modules/distribution/src/broker/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/broker/conf/datasources/master-datasources.xml
@@ -48,7 +48,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:../../repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095</url>
+                    <url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>