diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 91e5b60..63c1c10 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        java_version: [11, 17]
+        java_version: [11, 17, 21]
 
     steps:
     - name: Checkout ICAT Ansible
diff --git a/roles/java/defaults/main.yml b/roles/java/defaults/main.yml
index dbef904..03bc3db 100644
--- a/roles/java/defaults/main.yml
+++ b/roles/java/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
 
-# Either choose '11' or '17'
+# Either choose '11', '17' or '21'
 java_version: '11'