diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81c22d94..1e5c18fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,9 +19,9 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-latest
-          - ubuntu-20.04
-          - windows-latest
+          - macos-15
+          - ubuntu-24.04
+          - windows-2025
         host:
           - x64
         target:
@@ -29,11 +29,15 @@ jobs:
         node:
           - 18
         include:
-          - os: windows-latest
+          - os: windows-2025
             node: 18
             host: x86
             target: x86
-          - os: macos-m1
+          - os: macos-15
+            node: 18
+            host: arm64
+            target: arm64
+          - os: ubuntu-24.04-arm64
             node: 18
             host: arm64
             target: arm64
@@ -45,12 +49,7 @@ jobs:
           node-version: ${{ matrix.node }}
           architecture: ${{ matrix.host }}
 
-      - name: Add yarn (self-hosted)
-        if: matrix.os == 'macos-m1'
-        run: npm install -g yarn
-
       - name: Add setuptools for Python 3.12 (temp)
-        if: matrix.os != 'macos-m1'
         run: pip install setuptools
 
       - name: Add msbuild to PATH
@@ -101,7 +100,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: matrix.node == 18
         with:
-          name: prebuilt-binaries
+          name: prebuilt-binaries-${{ matrix.os }}-${{ matrix.target }}
           path: prebuilds/*
           retention-days: 7
 
@@ -120,7 +119,6 @@ jobs:
         target:
           - linux/arm64
         variant:
-          - bullseye
           - alpine3.15
         include:
           # musl x64 builds
@@ -155,7 +153,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: matrix.node == 18
         with:
-          name: prebuilt-binaries
+          name: prebuilt-binaries-${{ matrix.variant }}
           path: prebuilds/*
           retention-days: 7