diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index eb22f83..6a16df4 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -11,8 +11,7 @@ jobs:
         target:
           - double: aarch64-linux                   # target we are building for
             system: aarch64-linux                   # system we are building on
-            emulated: true                          # whether this build is being emulated
-            runner: ubuntu-24.04                    # GitHub runner the build is running on
+            runner: ubuntu-24.04-arm                # GitHub runner the build is running on
             flake: bundled                          # flake package to build
             interpreter: /lib/ld-linux-aarch64.so.1 # path to libc interpreter
           - double: x86_64-linux
@@ -36,15 +35,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: QEMU
-        if: ${{ matrix.target.emulated }}
-        run: sudo apt-get install -y qemu-user-static
       - name: Nix
-        uses: DeterminateSystems/nix-installer-action@v16
-        with:
-          extra-conf: extra-platforms = ${{ matrix.target.system }}
+        uses: nixbuild/nix-quick-install-action@v29
       - name: Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v8
+        uses: nix-community/cache-nix-action@v5
+        with:
+          primary-key: nix-${{ matrix.target.double }}
+          gc-max-store-size: 1879048192
       - name: Build
         run: nix build -L .#packages.${{ matrix.target.system }}.${{ matrix.target.flake }}
       - name: Set interpreter
diff --git a/.github/workflows/Container.yaml b/.github/workflows/Container.yaml
index 788f7e7..23197ac 100644
--- a/.github/workflows/Container.yaml
+++ b/.github/workflows/Container.yaml
@@ -13,25 +13,23 @@ jobs:
     strategy:
       matrix:
         target:
-          - double: aarch64-linux # target we are building for
-            architecture: arm64   # container architecture label
-            emulated: true        # whether this build host is being emulated
+          - double: aarch64-linux    # target we are building for
+            architecture: arm64      # container architecture label
+            runner: ubuntu-24.04-arm # GitHub runner the build is running on
           - double: x86_64-linux
             architecture: amd64
-    runs-on: ubuntu-24.04
+            runner: ubuntu-24.04
+    runs-on: ${{ matrix.target.runner }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: QEMU
-        if: ${{ matrix.target.emulated }}
-        run: sudo apt-get install -y qemu-user-static
       - name: Nix
-        uses: DeterminateSystems/nix-installer-action@v16
-        with:
-          extra-conf: |
-            extra-platforms = ${{ matrix.target.double }}
+        uses: nixbuild/nix-quick-install-action@v29
       - name: Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v8
+        uses: nix-community/cache-nix-action@v5
+        with:
+          primary-key: nix-${{ matrix.target.double }}
+          gc-max-store-size: 1879048192
       - name: Build
         run: nix build -L .#packages.${{ matrix.target.double }}.container
       - name: Login