diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
index d6ce11266d..80481fb0a6 100644
--- a/.github/workflows/build-wasm.yml
+++ b/.github/workflows/build-wasm.yml
@@ -36,6 +36,10 @@ jobs:
         with:
           prefix-key: build
           shared-key: wasm
+          workspaces: |
+            .
+            ./target/srtool
+          cache-directories: ./runtime
 
       # Use this to debug what's going on inside the srtool container
       # - name: Run Docker SRTool
@@ -137,7 +141,7 @@ jobs:
         with:
           tag: ${{ github.ref_name }}
           commit: ${{ github.sha }}
-          artifacts: "${{ steps.srtool_build.outputs.wasm }}"
+          artifacts: "${{ steps.srtool_build.outputs.wasm }}, ${{ matrix.chain }}-srtool-digest.json"
           replacesArtifacts: true
           allowUpdates: true
           artifactErrorsFailBuild: true
diff --git a/.github/workflows/sanity-checks.yml b/.github/workflows/sanity-checks.yml
index bc6f41776e..999f4603fc 100644
--- a/.github/workflows/sanity-checks.yml
+++ b/.github/workflows/sanity-checks.yml
@@ -9,6 +9,7 @@ permissions:
   contents: read
 jobs:
   test-n-lint:
+    timeout-minutes: 90
     name: ${{ matrix.target }}
     runs-on: ubuntu-latest-8-cores
     strategy:
@@ -40,6 +41,7 @@ jobs:
           RUSTC_WRAPPER: "sccache"
 
   benchmark-check:
+    # timeout-minutes: 90 # <- Not needed as ubunt-latest is free of charge
     name: bench-check-${{ matrix.runtime }}
     runs-on: ubuntu-latest #-4-cores
     strategy: