diff --git a/.github/templates/setup-worker/action.yaml b/.github/templates/setup-worker/action.yaml
index 381feac9..f198aa8a 100644
--- a/.github/templates/setup-worker/action.yaml
+++ b/.github/templates/setup-worker/action.yaml
@@ -10,10 +10,3 @@ runs:
     - name: Setup Ubuntu dependencies
       shell: bash
       run: sudo apt update && sudo apt install -y git clang curl libssl-dev llvm libudev-dev cmake protobuf-compiler
-
-    - name: Install Rust nightly
-      shell: bash
-      run: |
-        rustup toolchain install nightly-2023-01-01 --profile minimal --component rustfmt
-        rustup default nightly-2023-01-01
-        rustup target add wasm32-unknown-unknown
\ No newline at end of file
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 855fb14f..3805d8d5 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -11,6 +11,7 @@ on:
   workflow_dispatch:
 
 env:
+  CARGO_INCREMENTAL: 0
   POLKA_VERSION: 1.0.0
 
 jobs:
@@ -35,16 +36,10 @@ jobs:
         uses: "./.github/templates/setup-worker"
 
       - name: Cache Build artefacts
-        uses: actions/cache@v3
+        uses: Swatinem/rust-cache@v2.7.0
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-release-${{ env.POLKA_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-release-${{ env.POLKA_VERSION }}
+          cache-on-failure: true
+          shared-key: ${{ env.POLKA_VERSION }}-release
 
       - name: Check Build Trappist node
         run: |
@@ -64,16 +59,10 @@ jobs:
         uses: "./.github/templates/setup-worker"
 
       - name: Cache Build artefacts
-        uses: actions/cache@v3
+        uses: Swatinem/rust-cache@v2.7.0
         with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-debug-${{ env.POLKA_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-debug-${{ env.POLKA_VERSION }}
+          cache-on-failure: true
+          shared-key: ${{ env.POLKA_VERSION }}-debug
 
       - name: Run Trappist tests
         run: |
diff --git a/Cargo.toml b/Cargo.toml
index 5b563ae9..8be24138 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,7 @@ members = [
 exclude = [
 	"xcm-simulator"
 ]
+resolver = "2"
 
 [profile.release]
 panic = "unwind"
@@ -17,6 +18,9 @@ inherits = "release"
 lto = true
 codegen-units = 1
 
+[profile.test]
+debug = 0
+
 [workspace.package]
 authors = ["Trappist Network <https://github.com/TrappistNetwork>"]
 homepage = "https://trappist.io"