diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cb5a751..a64f098f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,10 +36,12 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Set up Rust
+      - name: Show toolchain versions
         run: |
-          rustup override set nightly
-          rustup component add llvm-tools-preview rust-src clippy
+          rustup show
+          rustup --version
+          rustc --version
+          cargo --version
 
       - name: Install cargo crates
         run: cargo install cargo-binutils rustfilt
diff --git a/Makefile b/Makefile
index 52805cb6..9f05bde2 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ kernel_symbols := $(kernel_elf:.elf=.symbols)
 
 PROGRESS   := printf "  \\033[1;96m%8s\\033[0m  \\033[1;m%s\\033[0m\\n"
 PYTHON3    ?= python3
-CARGO      ?= cargo +nightly
+CARGO      ?= cargo
 BOCHS      ?= bochs
 NM         ?= rust-nm
 READELF    ?= readelf
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 00000000..cf9072da
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2021-12-04"
+components = [ "rustfmt", "clippy", "llvm-tools-preview", "rust-src" ]