diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 408629417..49f45a05b 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -41,12 +41,12 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             ~/.cargo/bin
-          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.version }}-linux-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo build
         uses: actions/cache@v2
         with:
           path: target
-          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-build-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.version }}-linux-build-${{ hashFiles('**/Cargo.lock') }}
 
       - name: check build
         uses: actions-rs/cargo@v1
@@ -88,7 +88,5 @@ jobs:
 
       - name: Clear the cargo caches
         run: |
-          rustup update stable
-          rustup override set stable
           cargo install cargo-cache --no-default-features --features ci-autoclean
           cargo-cache
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 938f088db..2a95dfac7 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -40,12 +40,12 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             ~/.cargo/bin
-          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.version }}-macos-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo build
         uses: actions/cache@v2
         with:
           path: target
-          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-build-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.version }}-macos-build-${{ hashFiles('**/Cargo.lock') }}
 
       - name: check build
         uses: actions-rs/cargo@v1
@@ -63,7 +63,5 @@ jobs:
 
       - name: Clear the cargo caches
         run: |
-          rustup update stable
-          rustup override set stable
           cargo install cargo-cache --no-default-features --features ci-autoclean
           cargo-cache
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9f4930cb2..ad2d4f66a 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -52,12 +52,12 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             ~/.cargo/bin
-          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.version }}-win-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo build
         uses: actions/cache@v2
         with:
           path: target
-          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-build-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ matrix.version }}-win-build-${{ hashFiles('**/Cargo.lock') }}
 
       - name: check build
         uses: actions-rs/cargo@v1
@@ -83,7 +83,5 @@ jobs:
 
       - name: Clear the cargo caches
         run: |
-          rustup update stable
-          rustup override set stable
           cargo install cargo-cache --no-default-features --features ci-autoclean
           cargo-cache