diff --git a/.github/workflows/macOS-12-Makefile.yml b/.github/workflows/macOS-12-Makefile.yml
index 5c292fff91b..f7902c3da06 100644
--- a/.github/workflows/macOS-12-Makefile.yml
+++ b/.github/workflows/macOS-12-Makefile.yml
@@ -15,18 +15,22 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew swiftlint breakage
       run: brew pin swiftlint
     - name: fixup GitHub Homebrew xcbeautify breakage
       run: brew pin xcbeautify
     - name: fixup GitHub Homebrew go breakage
-      run: brew unlink go@1.21
+      run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
     - name: fixup GitHub Homebrew node breakage
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+      run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make
diff --git a/.github/workflows/macOS-13-Makefile.yml b/.github/workflows/macOS-13-Makefile.yml
index 2aec519193b..38373486344 100644
--- a/.github/workflows/macOS-13-Makefile.yml
+++ b/.github/workflows/macOS-13-Makefile.yml
@@ -15,10 +15,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+      run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make