diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 84ca8087b..3142b52f8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [ 17, 19, 21 ]
+        java-version: [ 17, 19 ]
     name: Build with Java ${{ matrix.java-version }}
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index f562f21c4..f98b839ca 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: 17