diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 28b72cdf..c6de3867 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -385,6 +385,34 @@
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 
+					<execution>
+						<!-- Creating Carbon schema -->
+						<id>create-carbon-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="########### Create Carbon 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;AUTO_SERVER=TRUE" />
+
+								<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}/../distribution/src/core/resources/dbscripts/h2.sql" />
+								</sql>
+								<echo message="##################### END ####################" />
+							</tasks>
+						</configuration>
+					</execution>
+
 					<execution>
 						<!-- Creating Device Management schema -->
 						<id>copy-con</id>
diff --git a/modules/distribution/src/core/resources/dbscripts/h2.sql b/modules/distribution/src/core/resources/dbscripts/h2.sql
index ae48a9dc..bdfbeee6 100644
--- a/modules/distribution/src/core/resources/dbscripts/h2.sql
+++ b/modules/distribution/src/core/resources/dbscripts/h2.sql
@@ -161,11 +161,13 @@ CREATE INDEX IF NOT EXISTS REG_RESOURCE_TAG_IND_BY_VERSION ON REG_RESOURCE_TAG(R
 CREATE TABLE IF NOT EXISTS REG_PROPERTY (
             REG_ID         INTEGER NOT NULL AUTO_INCREMENT,
             REG_NAME       VARCHAR(100) NOT NULL,
-            REG_VALUE        VARCHAR(10000),
+            REG_VALUE        VARCHAR(1000),
             REG_TENANT_ID INTEGER DEFAULT 0,
             CONSTRAINT PK_REG_PROPERTY PRIMARY KEY(REG_ID, REG_TENANT_ID)
 );
 
+ALTER TABLE REG_PROPERTY ALTER COLUMN REG_VALUE varchar(10000);
+
 CREATE TABLE IF NOT EXISTS REG_RESOURCE_PROPERTY (
             REG_PROPERTY_ID         INTEGER NOT NULL,
             REG_VERSION             INTEGER,
@@ -329,7 +331,7 @@ CREATE TABLE IF NOT EXISTS UM_SHARED_USER_ROLE(
     UM_ROLE_TENANT_ID INTEGER NOT NULL,
     UNIQUE(UM_USER_ID,UM_ROLE_ID,UM_USER_TENANT_ID, UM_ROLE_TENANT_ID),
     FOREIGN KEY(UM_ROLE_ID,UM_ROLE_TENANT_ID) REFERENCES UM_ROLE(UM_ID,UM_TENANT_ID) ON DELETE CASCADE ,
-    FOREIGN KEY(UM_USER_ID,UM_USER_TENANT_ID) REFERENCES UM_USER(UM_ID,UM_TENANT_ID) ON DELETE CASCADE 
+    FOREIGN KEY(UM_USER_ID,UM_USER_TENANT_ID) REFERENCES UM_USER(UM_ID,UM_TENANT_ID) ON DELETE CASCADE
 );
 
 CREATE TABLE IF NOT EXISTS UM_ACCOUNT_MAPPING(