diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index f1313d1..98a2f2b 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -15,13 +15,13 @@ jobs:
   # architectures in parallel, before being merged into a universal binary while building
   # the app itself.
   php:
-    name: Build PHP on ${{ matrix.os }}
+    name: Build PHP on ${{ matrix.runner }}
     strategy:
       matrix:
-        os:
+        runner:
           - macos-13 # x64
-          - macos-14 # arm64
-    runs-on: ${{ matrix.os }}
+          - macos-latest # arm64
+    runs-on: ${{ matrix.runner }}
     env:
       # The extensions and libraries needed to build PHP. These need to be variables so we can
       # use them to generate a cache key.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a820d63..a3317d4 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -14,8 +14,13 @@ on:
 # compile PHP and build the launcher.
 jobs:
   build:
-    name: Build
-    runs-on: windows-latest
+    name: Build on ${{ matrix.runner }}
+    strategy:
+      matrix:
+        runner:
+          - windows-latest # x86
+          - windows-11-arm # arm64
+    runs-on: ${{ matrix.runner }}
     env:
       # The extensions and libraries needed to build PHP. These need to be variables so we can
       # use them to generate a cache key.
@@ -41,7 +46,7 @@ jobs:
       - name: Generate cache key
         shell: bash
         run: |
-          CACHE_KEY=${{ runner.os }}-$PHP_VERSION-$(echo $PHP_EXTENSIONS | tr ',' '-')
+          CACHE_KEY=${{ runner.os }}-${{ runner.arch }}-$PHP_VERSION--$(echo $PHP_EXTENSIONS | tr ',' '-')
           echo "CACHE_KEY=${CACHE_KEY}" >> "$GITHUB_ENV"
 
       - id: cache-php
@@ -111,6 +116,6 @@ jobs:
         if: ${{ env.PUBLISH == 'never' }}
         uses: actions/upload-artifact@v4
         with:
-          name: app
+          name: app-${{ runner.arch }}
           path: dist/*.exe
           retention-days: 7