diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da9d2b988..d31efaf98 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,8 @@ jobs:
             container: "{\"image\": \"elopeztob/alpine-haskell-stack-echidna:9.2.7\", \"options\": \"--user 1001\"}"
           - os: macos-latest
             shell: bash
+          - os: macos-latest-xlarge
+            shell: bash
           - os: windows-latest
             shell: msys2 {0}
 
@@ -35,7 +37,7 @@ jobs:
     steps:
       - name: Get Packages (macOS)
         if: runner.os == 'macOS'
-        run: brew install automake
+        run: brew install autoconf automake libtool
 
       - name: Get Packages (Windows)
         uses: msys2/setup-msys2@v2
@@ -59,7 +61,7 @@ jobs:
             openssl:p
 
       - name: Install Stack
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         id: stack
         if: matrix.container == ''
         with:
@@ -76,7 +78,7 @@ jobs:
           path: |
             ~/.local
             D:\a\_temp\msys64\home\runneradmin\.local
-          key: ${{ runner.os }}-local-${{ env.CACHE_VERSION }}-${{ hashFiles('.github/scripts/install-*') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-local-${{ env.CACHE_VERSION }}-${{ hashFiles('.github/scripts/install-*') }}
 
       - name: Cache Stack & Cabal
         uses: actions/cache@v3
@@ -87,7 +89,7 @@ jobs:
             ${{ steps.stack.outputs.stack-root || '~/.stack' }}/*
             !${{ steps.stack.outputs.stack-root || '~/.stack' }}/pantry/hackage/*.tar
             !${{ steps.stack.outputs.stack-root || '~/.stack' }}/pantry/hackage/*.tar.gz
-          key: ${{ runner.os }}-stack-${{ env.CACHE_VERSION }}-${{ hashFiles('package.yaml', 'stack.yaml') }}
+          key: ${{ runner.os }}-${{ runner.arch }}-stack-${{ env.CACHE_VERSION }}-${{ hashFiles('package.yaml', 'stack.yaml') }}
 
       - name: Build Libraries
         run: |
@@ -119,7 +121,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: echidna-${{ runner.os }}
+          name: echidna-${{ runner.os }}-${{ runner.arch }}
           path: echidna.tar.gz
 
       - name: Build and copy test suite