diff --git a/.github/workflows/build-macos-installers.yml b/.github/workflows/build-macos-installers.yml
index 9c3b726a8026..0e4a7068a398 100644
--- a/.github/workflows/build-macos-installers.yml
+++ b/.github/workflows/build-macos-installers.yml
@@ -53,7 +53,7 @@ jobs:
       matrix:
         python-version: ["3.10"]
         os:
-          - runs-on: macos-13
+          - runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
             name: intel
             bladebit-suffix: macos-x86-64.tar.gz
             arch-artifact-name: intel
@@ -296,7 +296,7 @@ jobs:
           - name: 13
             matrix: 13
             runs-on:
-              intel: macos-13
+              intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
           - name: 14
             matrix: 14
             runs-on:
diff --git a/.github/workflows/check_wheel_availability.yaml b/.github/workflows/check_wheel_availability.yaml
index 1bdec77e9ec6..75dc4264c5f0 100644
--- a/.github/workflows/check_wheel_availability.yaml
+++ b/.github/workflows/check_wheel_availability.yaml
@@ -32,7 +32,7 @@ jobs:
           - name: macOS
             matrix: macos
             runs-on:
-              intel: macos-13
+              intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
               arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
           - name: Windows
             matrix: windows
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 0d5f052e93ff..9cff6196c492 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -29,7 +29,7 @@ jobs:
           - name: macOS
             matrix: macos
             runs-on:
-              intel: macos-13
+              intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
               arm: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-arm64' || 'macos-15' }}
           - name: Windows
             matrix: windows
@@ -50,6 +50,11 @@ jobs:
               matrix: windows
             arch:
               matrix: arm
+          # Back to self hosted mac intel runners, which we have very few of
+          - os:
+              matrix: macos
+            arch:
+              matrix: intel
 
     steps:
       - name: Clean workspace
diff --git a/.github/workflows/test-install-scripts.yml b/.github/workflows/test-install-scripts.yml
index d4729b0d6509..69099dd4a3ad 100644
--- a/.github/workflows/test-install-scripts.yml
+++ b/.github/workflows/test-install-scripts.yml
@@ -40,7 +40,7 @@ jobs:
             emoji: 🍎
             runs-on:
               arm: macos-15
-              intel: macos-13
+              intel: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
             matrix: macos
           - name: Windows
             emoji: 🪟
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ede87eedafbc..7c860bed1041 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,7 +47,7 @@ on:
         type: boolean
       run-macos-intel:
         description: "run macOS-intel tests"
-        default: true
+        default: false
         required: false
         type: boolean
       run-macos-arm:
@@ -104,12 +104,24 @@ jobs:
             || 'main'
           }} >> "$GITHUB_OUTPUT"
 
+      - name: Generate mac intel configuration
+        id: macintel
+        run: |
+          echo mac_intel=${{
+            ( github.event_name == 'schedule' || inputs.run-macos-intel )
+            || ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.ref, 'refs/heads/release/') )
+            || ( github.repository_owner == 'Chia-Network' && github.repository == 'Chia-Network/chia-blockchain' && startsWith(github.base_ref, 'release/') )
+            && 'true'
+            || 'false'
+          }} >> "$GITHUB_OUTPUT"
+
     outputs:
       configuration: ${{ steps.configure.outputs.configuration }}
       matrix_mode: ${{ steps.configure.outputs.matrix_mode }}
+      mac_intel: ${{ steps.macintel.outputs.mac_intel }}
 
   macos-intel:
-    if: github.event_name != 'workflow_dispatch' || inputs.run-macos-intel
+    if: needs.configure.outputs.mac_intel == 'true'
     uses: ./.github/workflows/test-single.yml
     needs: configure
     with:
@@ -120,7 +132,7 @@ jobs:
       concurrency-name: macos-intel
       configuration: ${{ needs.configure.outputs.configuration }}
       matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
-      runs-on: macos-13
+      runs-on: ${{ github.repository_owner == 'Chia-Network' && 'macos-13-intel' || 'macos-13' }}
       arch: intel
       arch-emoji: 🌀
   macos-arm:
diff --git a/.github/workflows/upload-pypi-source.yml b/.github/workflows/upload-pypi-source.yml
index b299007649ed..94a563349484 100644
--- a/.github/workflows/upload-pypi-source.yml
+++ b/.github/workflows/upload-pypi-source.yml
@@ -44,7 +44,7 @@ jobs:
             matrix: macos
             emoji: 🍎
             runs-on:
-              intel: macos-13
+              intel: macos-13-intel
               arm: macos-13-arm64
           - name: Windows
             matrix: windows
@@ -74,6 +74,11 @@ jobs:
               matrix: windows
             arch:
               matrix: arm
+          # Back to self hosted mac intel runners, which we have very few of
+          - os:
+              matrix: macos
+            arch:
+              matrix: intel
 
     steps:
       - uses: chia-network/actions/clean-workspace@main