diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 869a5abf3..4ee84ec8c 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -21,7 +21,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
         os: [ubuntu-latest]
 
     name: Gradle Check Linux
@@ -59,7 +59,7 @@ jobs:
   Check-neural-search-windows:
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
         os: [windows-latest]
 
     name: Gradle Check Windows
@@ -82,7 +82,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
         os: [ubuntu-latest]
 
     name: Pre-commit Linux
@@ -120,7 +120,7 @@ jobs:
   Precommit-neural-search-windows:
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
         os: [windows-latest]
 
     name: Pre-commit Windows
diff --git a/.github/workflows/backwards_compatibility_tests_workflow.yml b/.github/workflows/backwards_compatibility_tests_workflow.yml
index 42d27bd57..0d3bcfea8 100644
--- a/.github/workflows/backwards_compatibility_tests_workflow.yml
+++ b/.github/workflows/backwards_compatibility_tests_workflow.yml
@@ -13,7 +13,7 @@ jobs:
   Restart-Upgrade-BWCTests-NeuralSearch:
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
+        java: [ 21 ]
         os: [ubuntu-latest,windows-latest]
         bwc_version : ["2.9.0","2.10.0","2.11.0","2.12.0","2.13.0","2.14.0","2.15.0","2.16.0","2.17.0","2.18.0"]
         opensearch_version : [ "2.19.0-SNAPSHOT" ]
@@ -40,7 +40,7 @@ jobs:
   Rolling-Upgrade-BWCTests-NeuralSearch:
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
+        java: [ 21 ]
         os: [ubuntu-latest,windows-latest]
         bwc_version: [ "2.11.0","2.12.0","2.13.0","2.14.0","2.15.0", "2.16.0", "2.17.0", "2.18.0" ]
         opensearch_version: [ "2.19.0-SNAPSHOT" ]
diff --git a/.github/workflows/test_aggregations.yml b/.github/workflows/test_aggregations.yml
index 281b3dc02..53da514ff 100644
--- a/.github/workflows/test_aggregations.yml
+++ b/.github/workflows/test_aggregations.yml
@@ -20,7 +20,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
         os: [ubuntu-latest]
 
     name: Integ Tests Linux
@@ -54,7 +54,7 @@ jobs:
   Check-neural-search-windows:
     strategy:
       matrix:
-        java: [11, 17, 21]
+        java: [21]
         os: [windows-latest]
 
     name: Integ Tests Windows
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 905d4a8ee..ea11030c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix bug where ingested document has list of nested objects ([#1040](https://github.com/opensearch-project/neural-search/pull/1040))
 - Fixed document source and score field mismatch in sorted hybrid queries ([#1043](https://github.com/opensearch-project/neural-search/pull/1043))
 ### Infrastructure
+- Fix CI for JDK upgrade towards 21 ([#835](https://github.com/opensearch-project/neural-search/pull/835))
 ### Documentation
 ### Maintenance
 ### Refactoring