diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 93cd508..fcacbc2 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -6,17 +6,28 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: zmkfirmware/zmk-build-arm:stable
+      image: ghcr.io/bcdevices/zephyr:latest
     name: Build
     steps:
       - name: Install Dependencies
-        run: apt update; apt install -y nodejs ssh
-      - name: Setup Node
-        uses: actions/setup-node@v3
+        run: |
+          apt-get update;
+          apt-get install --yes --no-install-recommends \
+            nodejs \
+            zstd
+
       - name: Checkout
         uses: actions/checkout@v3
+
+      - name: Hash west module
+        id: hash-west
+        run: |
+          HASH=$(sha256sum config/west.yml | head -c 64)
+          echo "hash=$HASH" >> "$GITHUB_OUTPUT"
+          echo "computed hash: $HASH"
+
       - name: Cache west modules
-        uses: https://github.com/actions/cache@v2
+        uses: actions/cache@v3
         env:
           cache-name: cache-zephyr-modules
         with:
@@ -25,39 +36,46 @@ jobs:
             tools/
             zephyr/
             bootloader/
-            zmk/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('manifest-dir/west.yml') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ steps.hash-west.outputs.hash }}
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
+        timeout-minutes: 5
+        continue-on-error: true
+
       - name: West Init
         run: west init -l config
+
       - name: West Update
         run: west update
+
       - name: West Zephyr export
         run: west zephyr-export
 
       - name: West Build (Corne Left)
         run: west build -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_left -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
+
       - name: Corne Left Kconfig file
         run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
+
       - name: Rename zmk.uf2
         run: cp build/zephyr/zmk.uf2 corne_left_nice_nano_v2.uf2
-      - name: Archive (Corne Left)
-        uses: actions/upload-artifact@v3
-        with:
-          name: firmware
-          path: corne_left_nice_nano_v2.uf2
 
       - name: West Build (Corne Right)
         run: west build --pristine -s zmk/app -b nice_nano_v2 -- -DSHIELD=corne_right -DZMK_CONFIG="${GITHUB_WORKSPACE}/config"
+
       - name: Corne Right Kconfig file
         run: cat build/zephyr/.config | grep -v "^#" | grep -v "^$"
+
       - name: Rename zmk.uf2
         run: cp build/zephyr/zmk.uf2 corne_right_nice_nano_v2.uf2
-      - name: Archive (Corne Right)
+
+      - name: Zip Artifacts
+        run: zip firmware.zip corne_left_nice_nano_v2.uf2 corne_right_nice_nano_v2.uf2
+
+      - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
-          name: firmware
-          path: corne_right_nice_nano_v2.uf2
+          path: firmware.zip
+          name: firmware.zip