diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a8be39b1c..a48ae8b2bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Bumps `org.apache.httpcomponents.client5:httpclient5` from 5.2.1 to 5.3
 
 ### Changed
-- Restore support for Java 8 ([#767](https://github.com/opensearch-project/opensearch-java/pull/767))
 
 ### Deprecated
 
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md
index bdab6cc899..f439c8060e 100644
--- a/COMPATIBILITY.md
+++ b/COMPATIBILITY.md
@@ -19,7 +19,7 @@ The below matrix shows the compatibility of the [`opensearch-java-client`](https
 | Client Version | JDK                |
 |----------------|--------------------|
 | 1.0.0          | 8                  |
-| 2.x.0          | 8 / 11 / 17 / 21   |
+| 2.x.0          | 11 / 17 / 21       |
 
 ## Upgrading
 
diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts
index a4a67c789b..f9236608c2 100644
--- a/java-client/build.gradle.kts
+++ b/java-client/build.gradle.kts
@@ -61,8 +61,8 @@ configurations {
 }
 
 java {
-    targetCompatibility = JavaVersion.VERSION_1_8
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_11
 
     withJavadocJar()
     withSourcesJar()
@@ -146,10 +146,9 @@ val integrationTest = task<Test>("integrationTest") {
             System.getProperty("tests.awsSdk2support.domainRegion", "us-east-1"))
 }
 
-val opensearchVersion = "2.12.0-SNAPSHOT"
-
 dependencies {
 
+    val opensearchVersion = "2.7.0"
     val jacksonVersion = "2.15.2"
     val jacksonDatabindVersion = "2.15.2"