diff --git a/modules/analytics/distribution/ds_config.xml b/modules/analytics/distribution/ds_config.xml
index bf9fb179..08649d4b 100644
--- a/modules/analytics/distribution/ds_config.xml
+++ b/modules/analytics/distribution/ds_config.xml
@@ -8,7 +8,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:../core/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE</url>
+                    <url>jdbc:h2:../core/repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
diff --git a/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml
index d7d5a8b1..ec22c8a6 100755
--- a/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -30,7 +30,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE</url>
+                    <url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>