diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml
deleted file mode 100644
index 81f012d3e..000000000
--- a/.github/workflows/snap.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Snap
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  workflow_dispatch: {}
-
-jobs:
-  build-amd64:
-    runs-on: namespace-profile-ghostty-snap
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
-        with:
-          path: |
-            /nix
-            /zig
-      - run: sudo apt install -y udev
-      - run: sudo systemctl start systemd-udevd
-      - uses: snapcore/action-build@v1
-
-  build-arm64:
-    runs-on: namespace-profile-ghostty-snap-arm64
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
-        with:
-          path: |
-            /nix
-            /zig
-      - run: sudo apt install -y udev
-      - run: sudo systemctl start systemd-udevd
-      - uses: snapcore/action-build@v1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 41a54fde3..ebecdf21e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -276,6 +276,32 @@ jobs:
           nix develop -c zig build --system ${{ steps.deps.outputs.deps }} -Dapp-runtime=glfw -Drenderer=metal -Dfont-backend=coretext_harfbuzz
           nix develop -c zig build --system ${{ steps.deps.outputs.deps }} -Dapp-runtime=glfw -Drenderer=metal -Dfont-backend=coretext_noshape
 
+  build-snap:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          [namespace-profile-ghostty-snap, namespace-profile-ghostty-snap-arm64]
+    runs-on: ${{ matrix.os }}
+    needs: test
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        with:
+          path: |
+            /nix
+            /zig
+      - run: sudo apt install -y udev
+      - run: sudo systemctl start systemd-udevd
+      - uses: snapcore/action-build@v1
+
   build-windows:
     runs-on: windows-2022
     # this will not stop other jobs from running