diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index aef45787..c1bf5378 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -22,13 +22,6 @@ jobs:
        sudo apt-get install libzip5 ./mGBA-0.9.0-ubuntu64-focal/libmgba.deb -y && \
        rm -rf mgba.tar.xz mGBA-0.9.0-ubuntu64-focal
     - uses: actions/checkout@v2
-    - name: Nightly rust with required components
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: nightly-2021-04-20
-        components: clippy, rust-src
-        override: true
-
     - name: Cache
       uses: actions/cache@v2.1.1
       with:
@@ -36,7 +29,7 @@ jobs:
           ~/.cargo/registry
           ~/.cargo/git
           agb/target
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-${{ steps.rust_install.outputs.rustc_hash }}
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
     - name: install mgba-test-runner
       run: cargo install --path mgba-test-runner
diff --git a/agb/rust-toolchain.toml b/agb/rust-toolchain.toml
new file mode 100644
index 00000000..06842486
--- /dev/null
+++ b/agb/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly"
+components = ["rust-src", "clippy"]
\ No newline at end of file