diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
index 2b6c7f19c1d..8234c26f2ed 100644
--- a/.github/workflows/compilation.yml
+++ b/.github/workflows/compilation.yml
@@ -24,7 +24,8 @@ jobs:
       - name: Compile project ${{ matrix.debug }}
         run: |
           make -j $(getconf _NPROCESSORS_ONLN) clean
-          make -j $(getconf _NPROCESSORS_ONLN) ${{ matrix.debug }}
+          make -j $(getconf _NPROCESSORS_ONLN) ${{ matrix.debug }} || make clean
+          make -j ${{ matrix.debug }}
           make -j $(getconf _NPROCESSORS_ONLN) install
           # Create symbolink links using relative paths
           (cd $PS2DEV/ee/mips64r5900el-ps2-elf/lib && ln -sf ../../../ps2sdk/ee/lib/libcglue.a libcglue.a && cd -)
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
index aaf39850291..7b6698447d2 100644
--- a/.github/workflows/tools.yml
+++ b/.github/workflows/tools.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [
           [macos-latest, arm64, bash],
-          [macos-13, x86_64, bash],
+          [macos-15-intel, x86_64, bash],
           [ubuntu-latest, x86_64, bash],
           [windows-latest, x86_64, msys2]
         ]