diff --git a/components/org.wso2.carbon.metrics.jdbc.core/pom.xml b/components/org.wso2.carbon.metrics.jdbc.core/pom.xml
index 5b931e65..3ab6fd77 100644
--- a/components/org.wso2.carbon.metrics.jdbc.core/pom.xml
+++ b/components/org.wso2.carbon.metrics.jdbc.core/pom.xml
@@ -84,7 +84,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.com.h2database</groupId>
+            <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/components/org.wso2.carbon.metrics.jdbc.core/src/test/java/org/wso2/carbon/metrics/jdbc/core/ReporterTest.java b/components/org.wso2.carbon.metrics.jdbc.core/src/test/java/org/wso2/carbon/metrics/jdbc/core/ReporterTest.java
index 5976fec3..bcbf156a 100644
--- a/components/org.wso2.carbon.metrics.jdbc.core/src/test/java/org/wso2/carbon/metrics/jdbc/core/ReporterTest.java
+++ b/components/org.wso2.carbon.metrics.jdbc.core/src/test/java/org/wso2/carbon/metrics/jdbc/core/ReporterTest.java
@@ -114,7 +114,7 @@ public void testJDBCReporter() {
                 template.queryForList("SELECT * FROM METRIC_GAUGE WHERE NAME = ?", gaugeName);
         Assert.assertEquals(gaugeResult.size(), 1);
         Assert.assertEquals(gaugeResult.get(0).get("NAME"), gaugeName);
-        Assert.assertEquals(gaugeResult.get(0).get("VALUE"), "1");
+        Assert.assertEquals(gaugeResult.get(0).get("METRIC_GAUGE"), "1");
         Assert.assertEquals(gaugeResult.get(0).get("SOURCE"), "Carbon-jdbc");
     }
 
@@ -134,7 +134,7 @@ public void testJDBCReporterCachedGauge() {
                 template.queryForList("SELECT * FROM METRIC_GAUGE WHERE NAME = ?", gaugeName);
         Assert.assertEquals(gaugeResult.size(), 1);
         Assert.assertEquals(gaugeResult.get(0).get("NAME"), gaugeName);
-        Assert.assertEquals(gaugeResult.get(0).get("VALUE"), "1");
+        Assert.assertEquals(gaugeResult.get(0).get("METRIC_GAUGE"), "1");
         Assert.assertEquals(gaugeResult.get(0).get("SOURCE"), "Carbon-jdbc");
 
         adder.increment();
@@ -145,7 +145,7 @@ public void testJDBCReporterCachedGauge() {
                 template.queryForList("SELECT * FROM METRIC_GAUGE WHERE NAME = ? ORDER BY TIMESTAMP", gaugeName);
         Assert.assertEquals(gaugeResult2.size(), 2);
         Assert.assertEquals(gaugeResult2.get(1).get("NAME"), gaugeResult2.get(0).get("NAME"));
-        Assert.assertEquals(gaugeResult2.get(1).get("VALUE"), gaugeResult2.get(0).get("VALUE"));
+        Assert.assertEquals(gaugeResult2.get(1).get("METRIC_GAUGE"), gaugeResult2.get(0).get("METRIC_GAUGE"));
         Assert.assertEquals(gaugeResult2.get(1).get("SOURCE"), gaugeResult2.get(0).get("SOURCE"));
     }
 
diff --git a/components/org.wso2.carbon.metrics.jdbc.reporter/pom.xml b/components/org.wso2.carbon.metrics.jdbc.reporter/pom.xml
index 97148141..0a20a576 100644
--- a/components/org.wso2.carbon.metrics.jdbc.reporter/pom.xml
+++ b/components/org.wso2.carbon.metrics.jdbc.reporter/pom.xml
@@ -64,7 +64,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.com.h2database</groupId>
+            <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/components/org.wso2.carbon.metrics.jdbc.reporter/src/main/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporter.java b/components/org.wso2.carbon.metrics.jdbc.reporter/src/main/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporter.java
index c0c4b03c..d20f3c02 100644
--- a/components/org.wso2.carbon.metrics.jdbc.reporter/src/main/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporter.java
+++ b/components/org.wso2.carbon.metrics.jdbc.reporter/src/main/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporter.java
@@ -147,7 +147,7 @@ public JdbcReporter build(String source, DataSource dataSource) {
     private final TimeUnit timestampUnit;
 
     private static final String INSERT_GAUGE_QUERY =
-            "INSERT INTO METRIC_GAUGE (SOURCE, TIMESTAMP, NAME, VALUE) VALUES (?,?,?,?)";
+            "INSERT INTO METRIC_GAUGE (SOURCE, TIMESTAMP, NAME, METRIC_GAUGE) VALUES (?,?,?,?)";
     private static final String INSERT_COUNTER_QUERY =
             "INSERT INTO METRIC_COUNTER (SOURCE, TIMESTAMP, NAME, COUNT) VALUES (?,?,?,?)";
     private static final String INSERT_METER_QUERY =
diff --git a/components/org.wso2.carbon.metrics.jdbc.reporter/src/test/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporterTest.java b/components/org.wso2.carbon.metrics.jdbc.reporter/src/test/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporterTest.java
index c8f02fd7..743c689f 100644
--- a/components/org.wso2.carbon.metrics.jdbc.reporter/src/test/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporterTest.java
+++ b/components/org.wso2.carbon.metrics.jdbc.reporter/src/test/java/org/wso2/carbon/metrics/jdbc/reporter/JdbcReporterTest.java
@@ -105,7 +105,7 @@ public void reportsGaugeValues() {
         List<Map<String, Object>> result = template.queryForList("SELECT * FROM METRIC_GAUGE");
         Assert.assertEquals(result.size(), 1);
         Assert.assertEquals(result.get(0).get("NAME"), "gauge");
-        Assert.assertEquals(result.get(0).get("VALUE"), "1");
+        Assert.assertEquals(result.get(0).get("METRIC_GAUGE"), "1");
         Assert.assertEquals(result.get(0).get("SOURCE"), SOURCE);
         Assert.assertEquals(result.get(0).get("TIMESTAMP"), timestamp);
     }
diff --git a/components/org.wso2.carbon.metrics.jdbc.reporter/src/test/resources/dbscripts/h2.sql b/components/org.wso2.carbon.metrics.jdbc.reporter/src/test/resources/dbscripts/h2.sql
index 89d787ab..92363c6c 100644
--- a/components/org.wso2.carbon.metrics.jdbc.reporter/src/test/resources/dbscripts/h2.sql
+++ b/components/org.wso2.carbon.metrics.jdbc.reporter/src/test/resources/dbscripts/h2.sql
@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS METRIC_GAUGE (
     SOURCE VARCHAR(255) NOT NULL,
     TIMESTAMP BIGINT NOT NULL,
     NAME VARCHAR(255) NOT NULL,
-    VALUE VARCHAR(100) NOT NULL
+    METRIC_GAUGE VARCHAR(100) NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS METRIC_COUNTER (
diff --git a/features/org.wso2.carbon.metrics.jdbc.core.feature/pom.xml b/features/org.wso2.carbon.metrics.jdbc.core.feature/pom.xml
index f21fc09b..983b9ca9 100644
--- a/features/org.wso2.carbon.metrics.jdbc.core.feature/pom.xml
+++ b/features/org.wso2.carbon.metrics.jdbc.core.feature/pom.xml
@@ -39,7 +39,7 @@
             <artifactId>org.wso2.carbon.metrics.jdbc.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.com.h2database</groupId>
+            <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
     </dependencies>
@@ -96,7 +96,7 @@
                                     <path refid="maven.compile.classpath" />
                                 </path>
                                 <echo message="########### Creating Carbon Metrics Database ##############" />
-                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/database/metrics;create=true" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/resources/database/metrics" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
                                         <path refid="h2.classpath" />
                                     </classpath>
@@ -166,7 +166,7 @@
                                     <version>${carbon.metrics.version}</version>
                                 </bundle>
                                 <bundle>
-                                    <symbolicName>h2</symbolicName>
+                                    <symbolicName>com.h2database</symbolicName>
                                     <version>${h2.version}</version>
                                 </bundle>
                             </bundles>
diff --git a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/h2.sql b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/h2.sql
index 89d787ab..92363c6c 100644
--- a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/h2.sql
+++ b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/h2.sql
@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS METRIC_GAUGE (
     SOURCE VARCHAR(255) NOT NULL,
     TIMESTAMP BIGINT NOT NULL,
     NAME VARCHAR(255) NOT NULL,
-    VALUE VARCHAR(100) NOT NULL
+    METRIC_GAUGE VARCHAR(100) NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS METRIC_COUNTER (
diff --git a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mssql.sql b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mssql.sql
index fc2a3c2f..08297b38 100644
--- a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mssql.sql
+++ b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mssql.sql
@@ -20,7 +20,7 @@ CREATE TABLE METRIC_GAUGE (
     SOURCE VARCHAR(255) NOT NULL,
     TIMESTAMP BIGINT NOT NULL,
     NAME VARCHAR(255) NOT NULL,
-    VALUE VARCHAR(100) NOT NULL,
+    METRIC_GAUGE VARCHAR(100) NOT NULL,
 );
 
 IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[METRIC_COUNTER]') AND TYPE IN (N'U'))
diff --git a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mysql.sql b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mysql.sql
index edcc8fe6..a8547c6c 100644
--- a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mysql.sql
+++ b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/mysql.sql
@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS METRIC_GAUGE (
     SOURCE VARCHAR(255) NOT NULL,
     TIMESTAMP BIGINT NOT NULL,
     NAME VARCHAR(255) NOT NULL,
-    VALUE VARCHAR(100) NOT NULL
+    METRIC_GAUGE VARCHAR(100) NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS METRIC_COUNTER (
diff --git a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/oracle.sql b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/oracle.sql
index bf40d923..753ff4de 100644
--- a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/oracle.sql
+++ b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/oracle.sql
@@ -19,7 +19,7 @@ CREATE TABLE METRIC_GAUGE (
     SOURCE VARCHAR(255) NOT NULL,
     TIMESTAMP NUMBER(20) NOT NULL,
     NAME VARCHAR(255) NOT NULL,
-    VALUE VARCHAR(100) NOT NULL
+    METRIC_GAUGE VARCHAR(100) NOT NULL
 )
 /
 CREATE SEQUENCE METRIC_GAUGE_SEQUENCE START WITH 1 INCREMENT BY 1 NOCACHE
diff --git a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/postgresql.sql b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/postgresql.sql
index 207486bb..74943d66 100644
--- a/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/postgresql.sql
+++ b/features/org.wso2.carbon.metrics.jdbc.core.feature/resources/sql/postgresql.sql
@@ -21,7 +21,7 @@ CREATE TABLE METRIC_GAUGE (
     SOURCE VARCHAR(255) NOT NULL,
     TIMESTAMP BIGINT NOT NULL,
     NAME VARCHAR(255) NOT NULL,
-    VALUE VARCHAR(100) NOT NULL
+    METRIC_GAUGE VARCHAR(100) NOT NULL
 );
 
 CREATE SEQUENCE METRIC_COUNTER_SEQUENCE START WITH 1 INCREMENT BY 1;
diff --git a/pom.xml b/pom.xml
index 48efd494..2ccfac9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,7 +340,7 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.orbit.com.h2database</groupId>
+                <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
                 <version>${h2.version}</version>
             </dependency>
@@ -855,7 +855,7 @@
         <slf4j.version.range>[1.7.0,1.8.0)</slf4j.version.range>
         <log4j.version>2.9.1</log4j.version>
         <hikaricp.version>2.7.2</hikaricp.version>
-        <h2.version>1.4.199.wso2v1</h2.version>
+        <h2.version>2.1.210</h2.version>
         <spring.version>5.0.1.RELEASE</spring.version>
         <mockito.version>2.11.0</mockito.version>
         <tomcat.version>9.0.1</tomcat.version>
diff --git a/tests/osgi-tests/pom.xml b/tests/osgi-tests/pom.xml
index e35f07e8..778486d1 100644
--- a/tests/osgi-tests/pom.xml
+++ b/tests/osgi-tests/pom.xml
@@ -127,7 +127,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.orbit.com.h2database</groupId>
+            <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>