diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 3ace5b86..1309a5eb 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -19,7 +19,7 @@ jobs:
     needs: Get-CI-Image-Tag
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
 
     name: Build and Test geospatial Plugin
     runs-on: ubuntu-latest
@@ -52,7 +52,7 @@ jobs:
   Build-windows-macos:
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
         os: [windows-latest, macos-latest]
 
     name: Build and Test geospatial Plugin
diff --git a/.github/workflows/test_security.yml b/.github/workflows/test_security.yml
index 2ac480d4..88328c14 100644
--- a/.github/workflows/test_security.yml
+++ b/.github/workflows/test_security.yml
@@ -15,7 +15,7 @@ jobs:
   Build-ad:
     strategy:
       matrix:
-        java: [ 11,17 ]
+        java: [ 11,17,21 ]
         os: [ubuntu-latest]
       fail-fast: true