diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 00d553f8..f9dc7b60 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [11, 17]
+        java-version: [11, 17, 21]
     steps:
       - uses: actions/checkout@v6
         with:
@@ -31,7 +31,7 @@ jobs:
           distribution: temurin
           cache: gradle
       - name: Cache SonarCloud packages
-        if: matrix.java-version == 17
+        if: matrix.java-version == 21
         uses: actions/cache@v5
         with:
           path: ~/.sonar/cache
@@ -41,17 +41,11 @@ jobs:
       - name: Build javadoc
         run: ./gradlew --no-daemon --info javadoc
 
-      - name: Set up JDK 21 for Sonar
-        if: matrix.java-version == 17
-        uses: actions/setup-java@v5
-        with:
-          java-version: '21'
-          distribution: 'temurin'
       - name: Analyze with sonarqube
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        if: matrix.java-version == 17 && env.SONAR_TOKEN != ''
+        if: matrix.java-version == 21 && env.SONAR_TOKEN != ''
         run: ./gradlew --no-daemon --info --stacktrace sonarqube -Dsonar.verbose=true -Dsonar.login=$SONAR_TOKEN
       - uses: actions/upload-artifact@v7
         if: failure()