diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 021dec2e66..1150b09fe8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        java: [11, 17, 20, 21-ea]
+        java: [11, 17, 21]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 4
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index eb1127ccf4..d494e62941 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'zulu'
 
     - name: Install Toolchain JDK
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
index 4bea0bc16c..3b3b2451f1 100644
--- a/.github/workflows/coveralls.yaml
+++ b/.github/workflows/coveralls.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - name: Report Coverage to Coveralls for Pull Requests
         if: github.event_name == 'pull_request'
diff --git a/.github/workflows/eclipse-ci.yaml b/.github/workflows/eclipse-ci.yaml
index 76a60851b7..b6845f5a7c 100644
--- a/.github/workflows/eclipse-ci.yaml
+++ b/.github/workflows/eclipse-ci.yaml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [17, 20, 21-ea]
+        java: [17, 21]
         distribution: ['zulu']
       fail-fast: false
       max-parallel: 4
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index 5cc95b3f59..e856a6d34a 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -37,7 +37,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - name: Analyze with SonarCloud
         # Note: the mvnw executable is in the parent directory - not this working directory. We only do sonar on the
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
index 2971e25771..a832481184 100644
--- a/.github/workflows/sonatype.yaml
+++ b/.github/workflows/sonatype.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: zulu
       - name: Deploy to Sonatype
         run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml -Dlicense.skip=true