diff --git a/.github/workflows/alternative-os-build-main.yml b/.github/workflows/alternative-os-build-main.yml
index 3d23598d27768..e180456297411 100644
--- a/.github/workflows/alternative-os-build-main.yml
+++ b/.github/workflows/alternative-os-build-main.yml
@@ -34,23 +34,24 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macos-latest, windows-2019]
+        java: ['17', '21']
       fail-fast: false
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
-      - name: Set up JDK ${{ matrix.os }}
+      - name: Set up JDK ${{ matrix.java }} on ${{ matrix.os }}
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: ${{ matrix.java }}
           cache: 'maven'
-      - name: mvn build ${{ matrix.os }}
+      - name: mvn build ${{ matrix.os }} jdk-${{ matrix.java }}
         run: ./mvnw -B -V -D'http.keepAlive=false' -l build.log -D'maven.wagon.http.pool=false' -D'maven.wagon.httpconnectionManager.ttlSeconds=120' --no-transfer-progress -Dquickly install
-      - name: Archive logs ${{ matrix.os }}
+      - name: Archive logs ${{ matrix.os }} jdk-${{ matrix.java }}
         uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: always()
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-jdk-${{ matrix.java }}
           path: build.log
           retention-days: 2
diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml
index 9576d9d759a1a..eadb0fb5c66e8 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -41,10 +41,10 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        java: ['17']
-        experimental: [ false ]
+        java: ['17', '21']
+        experimental: [false, false]
         include:
-          - java: '21'
+          - java: '25'
             experimental: true
 
     steps: