diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index d7b427e04..8613f7e0d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -71,10 +71,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
-          target: ${{ matrix.target }}
-          components: rust-src, rustfmt
-          override: true
+          toolchain: stable
       - name: cache
         id: cache-target
         uses: actions/cache@v2
@@ -90,8 +87,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
-          components: rustfmt
-          override: true
+          toolchain: stable
       - name: Check fmt
         run: for i in embassy-*; do (cd $i; cargo fmt -- --check); done
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000..2cb177974
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,6 @@
+# Before upgrading check that everything is available on all tier1 targets here:
+# https://rust-lang.github.io/rustup-components-history
+[toolchain]
+channel = "nightly-2021-05-07"
+components = [ "rust-src", "rustfmt" ]
+targets = [ "thumbv7em-none-eabi", "thumbv6m-none-eabi" ]