diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 9cff6196c492..47d5c8135ef4 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -16,6 +16,8 @@ jobs:
   pre-commit:
     name: ${{ matrix.os.name }} ${{ matrix.arch.name }} ${{ matrix.python.major_dot_minor }}
     runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
+    # Back to self hosted mac intel runners, which we have very few of
+    if: ${{ !(matrix.os.matrix == 'macos' && matrix.arch.matrix == 'intel') }}
     timeout-minutes: 20
     strategy:
       fail-fast: false
@@ -50,11 +52,6 @@ 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/upload-pypi-source.yml b/.github/workflows/upload-pypi-source.yml
index 94a563349484..eaa3eb4fe792 100644
--- a/.github/workflows/upload-pypi-source.yml
+++ b/.github/workflows/upload-pypi-source.yml
@@ -26,9 +26,10 @@ permissions:
 
 jobs:
   mypy:
-    if: github.repository_owner == 'Chia-Network'
     name: ${{ matrix.os.emoji }} ${{ matrix.arch.emoji }} ${{ matrix.check.name }} - ${{ matrix.os.name }} ${{ matrix.python.major_dot_minor }}
     runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
+    # Back to self hosted mac intel runners, which we have very few of
+    if: ${{ github.repository_owner == 'Chia-Network' && !(matrix.os.matrix == 'macos' && matrix.arch.matrix == 'intel') }}
     timeout-minutes: 20
     strategy:
       fail-fast: false
@@ -74,11 +75,6 @@ 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