diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml
index 3822f7379aec..1563db258ee4 100644
--- a/.github/workflows/cross-version.yml
+++ b/.github/workflows/cross-version.yml
@@ -21,11 +21,17 @@ jobs:
       matrix:
         jdk:
         - version: 22
+          type: ga
+          distribution: temurin
         - version: 23
+          type: ga
+          distribution: oracle
         - version: 24
+          type: ea
         - version: 24
+          type: ea
           release: leyden
-    name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || 'ea' }})"
+    name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})"
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
@@ -35,11 +41,19 @@ jobs:
       - name: Set up Test JDK
         uses: ./.github/actions/setup-test-jdk
       - name: "Set up JDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || 'ea' }})"
+        if: matrix.jdk.type == 'ea'
         uses: oracle-actions/setup-java@2e744f723b003fdd759727d0ff654c8717024845 # v1.4.0
         with:
           website: jdk.java.net
           release: ${{ matrix.jdk.release || matrix.jdk.version }}
           version: latest
+      - name: "Set up JDK ${{ matrix.jdk.version }} (${{ matrix.jdk.distribution }})"
+        if: matrix.jdk.type == 'ga'
+        uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4
+        with:
+          distribution: ${{ matrix.jdk.distribution }}
+          java-version: ${{ matrix.jdk.version }}
+          check-latest: true
       - name: 'Prepare JDK${{ matrix.jdk.version }} env var'
         shell: bash
         run: echo "JDK${{ matrix.jdk.version }}=$JAVA_HOME" >> $GITHUB_ENV