diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 61bfc57..dd67600 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -15,7 +15,7 @@ jobs:
   Build-search-request-processor:
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     name: Build and Test Search Request Processor Plugin
diff --git a/.github/workflows/backwards_compatibility_tests_workflow.yml b/.github/workflows/backwards_compatibility_tests_workflow.yml
index 3a7e88c..8ffe9db 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-k-NN:
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 11, 17, 21 ]
         bwc_version : [ "2.7.0" ]
         opensearch_version : [ "3.0.0-SNAPSHOT" ]
 
@@ -41,8 +41,8 @@ jobs:
   Rolling-Upgrade-BWCTests-SRP:
     strategy:
       matrix:
-        java: [ 11, 17 ]
-        bwc_version: [ "2.7.0" ]
+        java: [ 11, 17, 21 ]
+        bwc_version: [ "2.11.1" ]
         opensearch_version: [ "3.0.0-SNAPSHOT" ]
 
     name: SRP Rolling-Upgrade BWC Tests