diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 691f3c4a..fcfd2067 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -29,7 +29,7 @@ jobs:
     container:
       image: ${{ needs.preflight.outputs.IMAGE }}
       volumes:
-        - /cache/cargo-target/pezkuwi-sdk-clippy:/cache/target
+        - /cache/cargo-target/pezkuwi-sdk:/cache/target
     env:
       RUSTFLAGS: "-D warnings"
       SKIP_WASM_BUILD: 1
@@ -55,13 +55,13 @@ jobs:
 
   check-try-runtime:
     runs-on: ${{ needs.preflight.outputs.RUNNER }}
-    needs: [preflight]
-    if: ${{ needs.preflight.outputs.changes_rust }}
+    needs: [preflight, cargo-clippy]
+    if: ${{ always() && !cancelled() && needs.preflight.outputs.changes_rust }}
     timeout-minutes: 45
     container:
       image: ${{ needs.preflight.outputs.IMAGE }}
       volumes:
-        - /cache/cargo-target/pezkuwi-sdk-try-runtime:/cache/target
+        - /cache/cargo-target/pezkuwi-sdk:/cache/target
     env:
       SKIP_WASM_BUILD: 1
       CARGO_INCREMENTAL: 0
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index a747f102..7a40da23 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -26,7 +26,7 @@ jobs:
     container:
       image: ${{ needs.preflight.outputs.IMAGE }}
       volumes:
-        - /cache/cargo-target/pezkuwi-sdk-test-doc:/cache/target
+        - /cache/cargo-target/pezkuwi-sdk-docs:/cache/target
     env:
       RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings"
       SKIP_WASM_BUILD: 1
@@ -47,12 +47,12 @@ jobs:
   build-rustdoc:
     runs-on: ${{ needs.preflight.outputs.RUNNER }}
     timeout-minutes: 45
-    if: ${{ needs.preflight.outputs.changes_rust }}
-    needs: [preflight]
+    if: ${{ always() && !cancelled() && needs.preflight.outputs.changes_rust }}
+    needs: [preflight, test-doc]
     container:
       image: ${{ needs.preflight.outputs.IMAGE }}
       volumes:
-        - /cache/cargo-target/pezkuwi-sdk-rustdoc:/cache/target
+        - /cache/cargo-target/pezkuwi-sdk-docs:/cache/target
     env:
       SKIP_WASM_BUILD: 1
       CARGO_INCREMENTAL: 0