diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c508d28b9b..0aa1b01987 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,8 +1,6 @@
 FROM mcr.microsoft.com/vscode/devcontainers/rust:0-1
 
-# Update to Rust 1.58.0
-RUN rustup update 1.58.0 && rustup default 1.58.0
-
 # Install Deno
 ENV DENO_INSTALL=/usr/local
 RUN curl -fsSL https://deno.land/x/install/install.sh | sh
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e08b4ca7b8..1312e8ea99 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,10 +82,7 @@ jobs:
           tar --exclude=".git*" --exclude=target --exclude=third_party/prebuilt \
               -czvf target/release/deno_src.tar.gz -C .. deno
 
-      - name: Install Rust
-        uses: hecrj/setup-rust-action@v1
-        with:
-          rust-version: 1.58.0
+      - uses: dtolnay/rust-toolchain@stable
 
       - name: Install clippy and rustfmt
         if: matrix.job == 'lint'
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000000..89378c52de
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.58.1"