diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 6fd4e1476633..94a766cb6c08 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -21,15 +21,12 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v2
+      - name: Install toolchain
+        run: rustup show
       # - name: Install yarn
       #   run: npm install -g yarn
       # - name: yarn install --no-immutable
       #   run: npm run init
-      - name: Install
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          override: true
       # - name: Configure cache
       #   uses: actions/cache@v2
       #   with:
diff --git a/.husky/pre-commit b/.husky/pre-commit
index fab6428a1a72..d2ae35e84b09 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-pnpm lint-staged
+yarn lint-staged
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index c7898c23f248..000000000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-nightly-2022-06-12
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000000..7f65710a4abb
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+profile = "default"
+channel = "1.62.0"