diff --git a/.github/workflows/linters-cargo.yml b/.github/workflows/linters-cargo.yml
index feac1282b..bdb7a0542 100644
--- a/.github/workflows/linters-cargo.yml
+++ b/.github/workflows/linters-cargo.yml
@@ -6,7 +6,6 @@ on:
   workflow_call:
 
 jobs:
-  # FIXME: check why this is rebuilding the project every time
   cargo-lint:
     runs-on: ubuntu-latest
     steps:
@@ -14,11 +13,18 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "cache"
-          save-if: false
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-2023-08-24
+          components: rustfmt, clippy
+          target: wasm32-unknown-unknown
+          profile: minimal
+
       - name: Setup build deps
         run: |
           sudo apt-get update
           sudo apt-get install -y clang llvm libudev-dev protobuf-compiler libasound2-dev
+
       - name: Format and clippy
         run: |
           cargo fmt -- --check
diff --git a/.github/workflows/rust-check.yml b/.github/workflows/rust-check.yml
index baa20e71e..a4f97ced8 100644
--- a/.github/workflows/rust-check.yml
+++ b/.github/workflows/rust-check.yml
@@ -13,19 +13,12 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "cache"
-      - uses: actions/cache@v3
+      - uses: actions-rs/toolchain@v1
         with:
-          path: |
-            target/release/deoxys
-          key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
-            github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
-            ${{ runner.os }}-cargo-
-
-      - name: Setup rust toolchain
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: rustup show
+          toolchain: nightly-2023-08-24
+          components: rustfmt, clippy
+          target: wasm32-unknown-unknown
+          profile: minimal
 
       - name: Setup check deps
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f241eaa45..6b6a7a1df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ git # Deoxys Changelog
 
 ## Next release
 
+- fix(worflows): fix toolchain and cache issue
 - feat: Removal of the hardcoded mainnet configuration
 - refactor: pass new CI
 - fix(workflows): Fix deoxys CI