diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9c4f9798..718793f5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -40,7 +40,7 @@ jobs:
         uses: dawidd6/action-download-artifact@v2
         with:
           workflow: rimage.yml
-          commit: ${{ env.GITHUB_SHA }}
+          commit: ${{ github.sha }}
           name: rimage binary (${{ matrix.target }})
           path: target
 
diff --git a/.github/workflows/rimage.yml b/.github/workflows/rimage.yml
index 68c3c191..2ff57d26 100644
--- a/.github/workflows/rimage.yml
+++ b/.github/workflows/rimage.yml
@@ -67,13 +67,13 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Setup nasm 🧑‍💻
         uses: ilammy/setup-nasm@v1
 
-      - name: Setup libjxl 🧑‍💻 (macos)
-        if: startsWith(matrix.os, 'macos')
+      - name: Setup libjxl 🧑‍💻 (x86_64 macos)
+        if: matrix.target == 'x86_64-apple-darwin'
         run: brew install jpeg-xl
 
       - name: Setup rust toolchain 🦀