diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a6f6913..25897416 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,14 +13,15 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         # Keep this list as: all supported LTS JDKs, the latest GA JDK, and the latest EA JDK (if available).
-        java: [ 11, 17, 20, 21-ea ]
+        java: [ 11, 17, 21 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v3
         with:
-          distribution: temurin
+          # Use 'oracle' distribution for JDK 21 until 'temurin' is available.
+          distribution: ${{ matrix.java == 21 && 'oracle' || 'temurin' }}
           java-version: ${{ matrix.java }}
       - name: Cache local Maven repository
         uses: actions/cache@v3