diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 04b049d2ee9..423d2608fa6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -448,7 +448,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, macos-14]
+        os: [macos-14, macos-13]
     runs-on: ${{ matrix.os }}
     env:
       PLATFORM: mac
@@ -543,14 +543,14 @@ jobs:
           otool -L ./haxelib
 
       - name: Upload artifact (x64)
-        if: matrix.os == 'macos-latest'
+        if: runner.arch == 'X64'
         uses: actions/upload-artifact@v4
         with:
           name: macX64Binaries
           path: out
 
       - name: Upload artifact (arm)
-        if: matrix.os == 'macos-14'
+        if: runner.arch == 'ARM64'
         uses: actions/upload-artifact@v4
         with:
           name: macArmBinaries
diff --git a/extra/github-actions/build-mac.yml b/extra/github-actions/build-mac.yml
index 543d9ba1105..65dcc41b4d8 100644
--- a/extra/github-actions/build-mac.yml
+++ b/extra/github-actions/build-mac.yml
@@ -56,14 +56,14 @@
     otool -L ./haxelib
 
 - name: Upload artifact (x64)
-  if: matrix.os == 'macos-latest'
+  if: runner.arch == 'X64'
   uses: actions/upload-artifact@v4
   with:
     name: macX64Binaries
     path: out
 
 - name: Upload artifact (arm)
-  if: matrix.os == 'macos-14'
+  if: runner.arch == 'ARM64'
   uses: actions/upload-artifact@v4
   with:
     name: macArmBinaries
diff --git a/extra/github-actions/workflows/main.yml b/extra/github-actions/workflows/main.yml
index 1e360f97e8e..354038f1260 100644
--- a/extra/github-actions/workflows/main.yml
+++ b/extra/github-actions/workflows/main.yml
@@ -308,7 +308,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, macos-14]
+        os: [macos-14, macos-13]
     runs-on: ${{ matrix.os }}
     env:
       PLATFORM: mac