diff --git a/.github/workflows/cbindgen.yml b/.github/workflows/cbindgen.yml
index 4d06db0..93023aa 100644
--- a/.github/workflows/cbindgen.yml
+++ b/.github/workflows/cbindgen.yml
@@ -17,10 +17,9 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install stable
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: stable
-        components: clippy, rustfmt
+        components: "clippy, rustfmt"
 
     - name: Run rustfmt
       run: |
@@ -32,14 +31,11 @@ jobs:
 
     - name: Install minimum supported Rust version
       id: msrv
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: 1.57
-        override: true
+      uses: dtolnay/rust-toolchain@1.57
 
     - name: Build with minimum supported Rust version
       run: |
-        cargo test nonexistent-test --verbose
+        cargo +${{steps.msrv.outputs.name}} test nonexistent-test --verbose
 
   build:
 
@@ -48,10 +44,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Install stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
+    - name: Install stable Rust
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Install Python
       uses: actions/setup-python@v4
@@ -79,9 +73,7 @@ jobs:
         (cd target/package/cbindgen-$(cargo run -- --version | cut -d ' ' -f 2) && cargo test --verbose)
 
     - name: Install nightly Rust
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: nightly
+      uses: dtolnay/rust-toolchain@nightly
 
     - name: Test
       env:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 994ea3b..379e476 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,9 +15,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install stable
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Build cbindgen
       run: |