diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle
index 2031d417b3..14b67670fa 100644
--- a/sql-jdbc/build.gradle
+++ b/sql-jdbc/build.gradle
@@ -24,7 +24,7 @@ plugins {
 group 'org.opensearch.client'
 
 // keep version in sync with version in Driver source
-version '1.1.0.1'
+version '2.0.0.0'
 
 boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false"));
 if (snapshot) {
@@ -98,6 +98,7 @@ shadowJar {
 }
 
 test {
+    systemProperty("opensearch_jdbc_version", version);
     useJUnitPlatform()
 }
 
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java
index e6a85879b8..337365e177 100644
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java
+++ b/sql-jdbc/src/main/java/org/opensearch/jdbc/ConnectionImpl.java
@@ -507,7 +507,7 @@ public Logger getLog() {
     }
 
     private String getUserAgent() {
-        return String.format("openes-jdbc/%s (Java %s)",
+        return String.format("opensearch-jdbc/%s (Java %s)",
                 Version.Current.getFullVersion(), JavaUtil.getJavaVersion());
     }
 }
diff --git a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java
index 977e743dda..006f0b6962 100644
--- a/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java
+++ b/sql-jdbc/src/main/java/org/opensearch/jdbc/internal/Version.java
@@ -8,8 +8,8 @@
 
 public enum Version {
 
-    // keep this in sync with the gradle version
-    Current(1, 0, 0, 0);
+    // keep this in sync with the sql-jdbc/build.gradle file
+    Current(2, 0, 0, 0);
 
     private int major;
     private int minor;
diff --git a/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java b/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java
new file mode 100644
index 0000000000..6c3c3f920b
--- /dev/null
+++ b/sql-jdbc/src/test/java/org/opensearch/jdbc/internal/VersionMatchTest.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import org.junit.jupiter.api.Test;
+import org.opensearch.jdbc.internal.Version;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class VersionMatchTest {
+
+    @Test
+    void testVersionMatchesBuildGradleVersion() {
+        assertEquals(Version.Current.getFullVersion(), System.getProperty("opensearch_jdbc_version"));
+    }
+}