diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index edc492898b..c670a5b4a2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,14 +34,16 @@ jobs:
         fetch-depth: 1 # only shallow here, we don't have jgit timestamps
         repository: eclipse-equinox/equinox.binaries
         path: equinox.binaries
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@v4
       with:
         java-version: |
           8
+          21
           17
         mvn-toolchain-id: |
           JavaSE-1.8
+          JavaSE-21
           JavaSE-17
         distribution: 'temurin'
         cache: maven
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5e11f57229..6af031f7a4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -45,14 +45,16 @@ jobs:
       uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
-    - name: Set up JDK 17
+    - name: Set up JDK
       uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         java-version: |
           8
+          21
           17
         mvn-toolchain-id: |
           JavaSE-1.8
+          JavaSE-21
           JavaSE-17
         distribution: 'temurin'
         cache: maven