diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 3f89a3185..df31b0353 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -21,8 +21,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        # Restricting java 21 to 21.0.1 due to ongoing bug in JDK 21.0.2 https://bugs.openjdk.org/browse/JDK-8323659. Once the fix https://github.com/opensearch-project/OpenSearch/pull/11968 get merged this change will be reverted.
-        java: [11, 17, 21.0.1]
+        java: [11, 17, 21]
         os: [ubuntu-latest]
 
     name: Gradle Check Linux
@@ -57,8 +56,7 @@ jobs:
   Check-neural-search-windows:
     strategy:
       matrix:
-        # Restricting java 21 to 21.0.1 due to ongoing bug in JDK 21.0.2 https://bugs.openjdk.org/browse/JDK-8323659. Once the fix https://github.com/opensearch-project/OpenSearch/pull/11968 get merged this change will be reverted.
-        java: [11, 17, 21.0.1]
+        java: [11, 17, 21]
         os: [windows-latest]
 
     name: Gradle Check Windows
@@ -86,8 +84,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        # Restricting java 21 to 21.0.1 due to ongoing bug in JDK 21.0.2 https://bugs.openjdk.org/browse/JDK-8323659. Once the fix https://github.com/opensearch-project/OpenSearch/pull/11968 get merged this change will be reverted.
-        java: [11, 17, 21.0.1]
+        java: [11, 17, 21]
         os: [ubuntu-latest]
 
     name: Pre-commit Linux
@@ -121,8 +118,7 @@ jobs:
   Precommit-neural-search-windows:
     strategy:
       matrix:
-        # Restricting java 21 to 21.0.1 due to ongoing bug in JDK 21.0.2 https://bugs.openjdk.org/browse/JDK-8323659. Once the fix https://github.com/opensearch-project/OpenSearch/pull/11968 get merged this change will be reverted.
-        java: [11, 17, 21.0.1]
+        java: [11, 17, 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 82b70dcf0..32a71c5d0 100644
--- a/.github/workflows/backwards_compatibility_tests_workflow.yml
+++ b/.github/workflows/backwards_compatibility_tests_workflow.yml
@@ -13,8 +13,7 @@ jobs:
   Restart-Upgrade-BWCTests-NeuralSearch:
     strategy:
       matrix:
-        # Restricting java 21 to 21.0.1 due to ongoing bug in JDK 21.0.2 https://bugs.openjdk.org/browse/JDK-8323659. Once the fix https://github.com/opensearch-project/OpenSearch/pull/11968 get merged this change will be reverted.
-        java: [ 11, 17, 21.0.1 ]
+        java: [ 11, 17, 21 ]
         os: [ubuntu-latest,windows-latest]
         bwc_version : ["2.9.0","2.10.0","2.11.0","2.12.0-SNAPSHOT"]
         opensearch_version : [ "3.0.0-SNAPSHOT" ]
@@ -41,8 +40,7 @@ jobs:
   Rolling-Upgrade-BWCTests-NeuralSearch:
     strategy:
       matrix:
-        # Restricting java 21 to 21.0.1 due to ongoing bug in JDK 21.0.2 https://bugs.openjdk.org/browse/JDK-8323659. Once the fix https://github.com/opensearch-project/OpenSearch/pull/11968 get merged this change will be reverted.
-        java: [ 11, 17, 21.0.1 ]
+        java: [ 11, 17, 21 ]
         os: [ubuntu-latest,windows-latest]
         bwc_version: [ "2.12.0-SNAPSHOT" ]
         opensearch_version: [ "3.0.0-SNAPSHOT" ]
diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml
index 163b8c220..5b7f9d210 100644
--- a/.github/workflows/test_security.yml
+++ b/.github/workflows/test_security.yml
@@ -20,8 +20,7 @@ jobs:
   integ-test-with-security-linux:
     strategy:
       matrix:
-        # Restricting java 21 to 21.0.1 due to ongoing bug in JDK 21.0.2 https://bugs.openjdk.org/browse/JDK-8323659. Once the fix https://github.com/opensearch-project/OpenSearch/pull/11968 get merged this change will be reverted.
-        java: [11, 17, 21.0.1]
+        java: [11, 17, 21]
 
     name: Run Integration Tests on Linux
     runs-on: ubuntu-latest