diff --git a/components/attachment-mgt/org.wso2.carbon.attachment.mgt/pom.xml b/components/attachment-mgt/org.wso2.carbon.attachment.mgt/pom.xml
index b7bd14174..945069572 100644
--- a/components/attachment-mgt/org.wso2.carbon.attachment.mgt/pom.xml
+++ b/components/attachment-mgt/org.wso2.carbon.attachment.mgt/pom.xml
@@ -138,7 +138,7 @@
                                     <path refid="maven.test.classpath" />
                                 </path>
                                 <echo message="########### Create Test Database ##############" />
-                                <sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="wso2carbon" url="jdbc:h2:${basedir}/target/repository/database/attachmentdb;create=true" userid="wso2carbon">
+                                <sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="wso2carbon" url="jdbc:h2:${basedir}/target/repository/database/attachmentdb" userid="wso2carbon">
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
diff --git a/components/bpel/org.wso2.carbon.bpel.b4p/pom.xml b/components/bpel/org.wso2.carbon.bpel.b4p/pom.xml
index ecdb23da2..4e16741c7 100644
--- a/components/bpel/org.wso2.carbon.bpel.b4p/pom.xml
+++ b/components/bpel/org.wso2.carbon.bpel.b4p/pom.xml
@@ -166,7 +166,7 @@
                                 </path>
 
                                 <echo message="########### Create B4P Coordination Database ##############" />
-                                <sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="" url="jdbc:h2:${basedir}/target/database/b4ph2db;create=true" userid="sa">
+                                <sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="" url="jdbc:h2:${basedir}/target/database/b4ph2db" userid="sa">
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
diff --git a/components/humantask/org.wso2.carbon.humantask/pom.xml b/components/humantask/org.wso2.carbon.humantask/pom.xml
index 86ebe5062..ec663de66 100644
--- a/components/humantask/org.wso2.carbon.humantask/pom.xml
+++ b/components/humantask/org.wso2.carbon.humantask/pom.xml
@@ -150,7 +150,7 @@
                                 </path>
 
                                 <echo message="########### Create HT Database ##############" />
-                                <sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="" url="jdbc:h2:${basedir}/target/database/hth2db;create=true" userid="sa">
+                                <sql autocommit="true" driver="org.h2.Driver" onerror="continue" password="" url="jdbc:h2:${basedir}/target/database/hth2db" userid="sa">
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
diff --git a/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/pom.xml b/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/pom.xml
index f1558e789..61325102e 100644
--- a/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/pom.xml
+++ b/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/pom.xml
@@ -65,7 +65,7 @@
 
                                 <echo message="########### Create Attachment Mgt Database ##############" />
 
-                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
diff --git a/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/bps-datasources.xml b/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/bps-datasources.xml
index 68d8383a9..7a54b797a 100644
--- a/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/bps-datasources.xml
+++ b/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/bps-datasources.xml
@@ -13,7 +13,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:file:./repository/database/jpadb;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE</url>
+                    <url>jdbc:h2:file:./repository/database/jpadb;DB_CLOSE_ON_EXIT=FALSE</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
diff --git a/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/datasources.properties b/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/datasources.properties
index afbeb3b8b..31682b456 100644
--- a/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/datasources.properties
+++ b/features/attachment-mgt/org.wso2.carbon.attachment.mgt.server.feature/resources/conf/datasources.properties
@@ -7,7 +7,7 @@ synapse.datasources.providerPort=2199
 synapse.datasources.bpsds.registry=JNDI
 synapse.datasources.bpsds.type=BasicDataSource
 synapse.datasources.bpsds.driverClassName=org.h2.Driver
-synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb;MVCC=TRUE
+synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb
 synapse.datasources.bpsds.username=wso2carbon
 synapse.datasources.bpsds.password=wso2carbon
 synapse.datasources.bpsds.validationQuery=SELECT 1
diff --git a/features/bpel/org.wso2.carbon.bpel.server.feature/pom.xml b/features/bpel/org.wso2.carbon.bpel.server.feature/pom.xml
index ea9fb7df9..7fad0b7a8 100644
--- a/features/bpel/org.wso2.carbon.bpel.server.feature/pom.xml
+++ b/features/bpel/org.wso2.carbon.bpel.server.feature/pom.xml
@@ -102,7 +102,7 @@
 
                                 <echo message="########### Create BPEL Database ##############" />
 
-                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
diff --git a/features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/bps-datasources.xml b/features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/bps-datasources.xml
index 68d8383a9..7a54b797a 100644
--- a/features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/bps-datasources.xml
+++ b/features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/bps-datasources.xml
@@ -13,7 +13,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:file:./repository/database/jpadb;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE</url>
+                    <url>jdbc:h2:file:./repository/database/jpadb;DB_CLOSE_ON_EXIT=FALSE</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>
diff --git a/features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/datasources.properties b/features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/datasources.properties
index afbeb3b8b..31682b456 100644
--- a/features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/datasources.properties
+++ b/features/bpel/org.wso2.carbon.bpel.server.feature/resources/conf/datasources.properties
@@ -7,7 +7,7 @@ synapse.datasources.providerPort=2199
 synapse.datasources.bpsds.registry=JNDI
 synapse.datasources.bpsds.type=BasicDataSource
 synapse.datasources.bpsds.driverClassName=org.h2.Driver
-synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb;MVCC=TRUE
+synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb
 synapse.datasources.bpsds.username=wso2carbon
 synapse.datasources.bpsds.password=wso2carbon
 synapse.datasources.bpsds.validationQuery=SELECT 1
diff --git a/features/bpmn/org.wso2.carbon.bpmn.server.feature/pom.xml b/features/bpmn/org.wso2.carbon.bpmn.server.feature/pom.xml
index 7942ecc73..ac110457e 100644
--- a/features/bpmn/org.wso2.carbon.bpmn.server.feature/pom.xml
+++ b/features/bpmn/org.wso2.carbon.bpmn.server.feature/pom.xml
@@ -75,7 +75,7 @@
 
                                 <echo message="########### Create Activiti Database ##############" />
 
-                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/activiti;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/activiti" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
diff --git a/features/humantask/org.wso2.carbon.humantask.server.feature/pom.xml b/features/humantask/org.wso2.carbon.humantask.server.feature/pom.xml
index d56192591..b7f9be36a 100644
--- a/features/humantask/org.wso2.carbon.humantask.server.feature/pom.xml
+++ b/features/humantask/org.wso2.carbon.humantask.server.feature/pom.xml
@@ -97,7 +97,7 @@
 
                                 <echo message="########### Create HumanTask Database ##############" />
 
-                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/conf/jpadb" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
diff --git a/features/humantask/org.wso2.carbon.humantask.server.feature/resources/conf/datasources.properties b/features/humantask/org.wso2.carbon.humantask.server.feature/resources/conf/datasources.properties
index afbeb3b8b..31682b456 100644
--- a/features/humantask/org.wso2.carbon.humantask.server.feature/resources/conf/datasources.properties
+++ b/features/humantask/org.wso2.carbon.humantask.server.feature/resources/conf/datasources.properties
@@ -7,7 +7,7 @@ synapse.datasources.providerPort=2199
 synapse.datasources.bpsds.registry=JNDI
 synapse.datasources.bpsds.type=BasicDataSource
 synapse.datasources.bpsds.driverClassName=org.h2.Driver
-synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb;MVCC=TRUE
+synapse.datasources.bpsds.url=jdbc:h2:file:./repository/database/jpadb
 synapse.datasources.bpsds.username=wso2carbon
 synapse.datasources.bpsds.password=wso2carbon
 synapse.datasources.bpsds.validationQuery=SELECT 1
diff --git a/pom.xml b/pom.xml
index d59ad7b6a..d3afd4175 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1522,7 +1522,7 @@
         <geronimo-spec-javamail>1.3.0.rc51-wso2v1</geronimo-spec-javamail>
         <geronimo-spec-jms>1.1.0.rc4-wso2v1</geronimo-spec-jms>
         <orbit.version.infinispan>5.1.2.wso2v1</orbit.version.infinispan>
-        <orbit.version.h2.engine>1.4.199.wso2v1</orbit.version.h2.engine>
+        <orbit.version.h2.engine>2.1.210.wso2v1</orbit.version.h2.engine>
         <orbit.version.spring>3.2.9.wso2v2</orbit.version.spring>
         <orbit.version.woden>1.0.0.M9-wso2v1</orbit.version.woden>
         <axion.wso2>1.0.0.M3-dev-wso2v1</axion.wso2>