diff --git a/.ci/bwcVersions b/.ci/bwcVersions
index e43e4c0fc40a6..77fb5a782c092 100644
--- a/.ci/bwcVersions
+++ b/.ci/bwcVersions
@@ -45,3 +45,4 @@ BWC_VERSION:
   - "2.19.0"
   - "2.19.1"
   - "2.19.2"
+  - "3.0.0"
diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties
index e290bda773f68..51dee79d6f872 100644
--- a/.ci/java-versions.properties
+++ b/.ci/java-versions.properties
@@ -14,7 +14,7 @@
 # are 'java' or 'openjdk' followed by the major release number.
 
 # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
-OPENSEARCH_BUILD_JAVA=openjdk17
-OPENSEARCH_RUNTIME_JAVA=java11
+OPENSEARCH_BUILD_JAVA=openjdk21
+OPENSEARCH_RUNTIME_JAVA=java21
 GRADLE_TASK=build
 GRADLE_EXTRA_ARGS=
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 61f4fbbf10b1d..f4cfdc39a6fc4 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,2 +1,2 @@
 # Please use ../gradle/libs.versions.toml for dependency management
-opensearch        = 3.0.0
+opensearch        = 3.1.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2a46687b61661..5ba8dd4a79311 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-opensearch        = "3.0.0"
+opensearch        = "3.1.0"
 lucene            = "10.1.0"
 
 bundled_jdk_vendor = "adoptium"
diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java
index 1fd759494a19a..9700609a26435 100644
--- a/libs/core/src/main/java/org/opensearch/Version.java
+++ b/libs/core/src/main/java/org/opensearch/Version.java
@@ -117,7 +117,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_19_1 = new Version(2190199, org.apache.lucene.util.Version.LUCENE_9_12_1);
     public static final Version V_2_19_2 = new Version(2190299, org.apache.lucene.util.Version.LUCENE_9_12_1);
     public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_10_1_0);
-    public static final Version CURRENT = V_3_0_0;
+    public static final Version V_3_1_0 = new Version(3010099, org.apache.lucene.util.Version.LUCENE_10_1_0);
+    public static final Version CURRENT = V_3_1_0;
 
     public static Version fromId(int id) {
         final Version known = LegacyESVersion.idToVersion.get(id);