diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b51c25c85a..fca481b3e3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 11 ]
+        java: [ 11, 17, 21 ]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - name: Checkout Java Client
diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
index d1509fc039..8cee43c124 100644
--- a/.github/workflows/test-integration-unreleased.yml
+++ b/.github/workflows/test-integration-unreleased.yml
@@ -20,6 +20,7 @@ jobs:
           - { opensearch_ref: '2.x', java: 17 }
           - { opensearch_ref: 'main', java: 11 }
           - { opensearch_ref: 'main', java: 17 }
+          - { opensearch_ref: 'main', java: 21 }
     steps:
       - name: Set up JDK ${{ matrix.entry.java }}
         uses: actions/setup-java@v3
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
index 70f591553c..982d3d957a 100644
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 11 ]
+        java: [ 11, 17, 21 ]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - name: Checkout Java Client