diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 059287a637b..1c2386b0600 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -14,8 +14,7 @@ runs:
       if: runner.os == 'macOS'
       shell: bash
       run: |
-        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew update
-        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install bison flex gawk libffi pkg-config bash autoconf llvm lld || true
+        brew bundle
 
     - name: Linux runtime environment
       if: runner.os == 'Linux'
@@ -29,7 +28,7 @@ runs:
       shell: bash
       run: |
         echo "${{ github.workspace }}/.local/bin" >> $GITHUB_PATH
-        echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH
+        echo "$(brew --prefix llvm@20)/bin" >> $GITHUB_PATH
         echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
         echo "$(brew --prefix flex)/bin" >> $GITHUB_PATH
         echo "procs=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 7a706e69a36..7d87ab56ee3 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -36,9 +36,12 @@ jobs:
           - 'clang-19'
           - 'gcc-13'
         include:
-          # macOS
+          # macOS x86
           - os: macos-13
             compiler: 'clang'
+          # macOS arm
+          - os: macos-latest
+            compiler: 'clang'
       fail-fast: false
     steps:
       - name: Checkout Yosys
diff --git a/Brewfile b/Brewfile
index 3696e40b084..7ed3fb906f0 100644
--- a/Brewfile
+++ b/Brewfile
@@ -6,9 +6,8 @@ brew "git"
 brew "graphviz"
 brew "pkg-config"
 brew "python3"
-brew "tcl-tk"
 brew "xdot"
 brew "bash"
 brew "boost-python3"
-brew "llvm"
+brew "llvm@20"
 brew "lld"