diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 4e00f8f217..06d2811e2e 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -3,10 +3,10 @@ on: [pull_request]
 jobs:
   build_pr:
     if: github.repository_owner == 'IntellectualSites'
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        java: [21, 25]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v6
@@ -17,12 +17,12 @@ jobs:
         with:
           distribution: temurin
           cache: gradle
-          java-version: 21
-      - name: Build on ${{ matrix.os }}
+          java-version: ${{ matrix.java }}
+      - name: Build on Java ${{ matrix.java }}
         run: ./gradlew build -s
       - name: Archive artifacts
+        if: ${{ matrix.java == 21 }}
         uses: actions/upload-artifact@v6
-        if: ${{ matrix.os == 'ubuntu-latest' }} # only upload once, use linux builds
         with:
             name: FastAsyncWorldEdit-SNAPSHOT
             path: worldedit-bukkit/build/libs/FastAsyncWorldEdit-*.jar
diff --git a/Jenkinsfile b/Jenkinsfile
index 94db4eda21..d8a2e24b96 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
         stage('Build') {
             steps {
                 withEnv([
-                        "PATH+JAVA=${tool 'Temurin-21.0.3_9'}/bin"
+                        "PATH+JAVA=${tool 'Temurin-25.0.1_8'}/bin"
                 ]) {
                     sh './gradlew clean build'
                 }