diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
index df82cc56f..507d8f3c5 100644
--- a/.github/workflows/bundles-mac.yml
+++ b/.github/workflows/bundles-mac.yml
@@ -39,16 +39,10 @@ on:
         required: true
 jobs:
   build:
-    runs-on: macos-13
+    runs-on: macos-15-intel
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup JPackage JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: 'temurin'
-          java-version: '25.0.1'
-
       - name: Setup Java
         uses: oracle-actions/setup-java@v1.4.0
         with:
@@ -109,7 +103,7 @@ jobs:
         env:
           MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
           JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
-          JPACKAGE_HOME: ${{ env.JAVA_HOME_24_X64 }}
+          JPACKAGE_HOME: ${{ env.JAVA_HOME }}
           MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
           MACSIGN_USER: ${{ secrets.MACSIGN_USER }}
           PROJECT_VERSION: ${{ inputs.project-version }}
diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
index af49a2137..d7cd2fad3 100644
--- a/.github/workflows/bundles-mac_aarch64.yml
+++ b/.github/workflows/bundles-mac_aarch64.yml
@@ -44,12 +44,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup JPackage JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: 'temurin'
-          java-version: '25.0.1'
-
       - name: Setup Java
         uses: oracle-actions/setup-java@v1.4.0
         with:
@@ -110,7 +104,7 @@ jobs:
         env:
           MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
           JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
-          JPACKAGE_HOME: ${{ env.JAVA_HOME_24_ARM64 }}
+          JPACKAGE_HOME: ${{ env.JAVA_HOME }}
           MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
           MACSIGN_USER: ${{ secrets.MACSIGN_USER }}
           PROJECT_VERSION: ${{ inputs.project-version }}