diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index edf7a0bbb..a7ccb13bc 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -17,7 +17,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [17]
+        java: [11, 17, 21]
       fail-fast: false
 
     name: Run Anomaly detection model performance benchmark
diff --git a/.github/workflows/test_build_multi_platform.yml b/.github/workflows/test_build_multi_platform.yml
index ac81a3697..24bc45787 100644
--- a/.github/workflows/test_build_multi_platform.yml
+++ b/.github/workflows/test_build_multi_platform.yml
@@ -16,7 +16,7 @@ jobs:
   Build-ad-windows:
     strategy:
       matrix:
-        java: [ 11, 17, 20 ]
+        java: [ 11, 17, 21 ]
     name: Build and Test Anomaly Detection Plugin on Windows
     runs-on: windows-latest
     env:
@@ -49,7 +49,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11, 17, 20]
+        java: [ 11, 17, 21 ]
       fail-fast: false
     name: Build and Test Anomaly detection Plugin
     runs-on: ubuntu-latest
@@ -89,7 +89,7 @@ jobs:
   Build-ad-macos:
     strategy:
       matrix:
-        java: [11,17,20]
+        java: [ 11, 17, 21 ]
       fail-fast: false
 
     name: Build and Test Anomaly detection Plugin
diff --git a/.github/workflows/test_bwc.yml b/.github/workflows/test_bwc.yml
index 10d41b70c..953f62009 100644
--- a/.github/workflows/test_bwc.yml
+++ b/.github/workflows/test_bwc.yml
@@ -17,7 +17,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11,17,20]
+        java: [11,17,21]
       fail-fast: false
 
     name: Test Anomaly detection BWC
diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml
index 861da6dc4..177035381 100644
--- a/.github/workflows/test_security.yml
+++ b/.github/workflows/test_security.yml
@@ -11,7 +11,7 @@ jobs:
   Build-ad:
     strategy:
       matrix:
-        java: [11,17,20]
+        java: [11,17,21]
       fail-fast: false
 
     name: Security test workflow for Anomaly Detection