diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b14d11ee4..fa42589a6 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-# Copyright (C) 2023 Daniel Mueller <deso@posteo.net>
+# Copyright (C) 2023-2024 Daniel Mueller <deso@posteo.net>
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 name: Publish
@@ -39,11 +39,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Install Rust
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
+    - uses: dtolnay/rust-toolchain@stable
     - name: Dry-run package creation
       run: cargo package --no-verify
     - name: Create git tag
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b0082af1e..b77975d16 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-# Copyright (C) 2022-2023 Daniel Mueller <deso@posteo.net>
+# Copyright (C) 2022-2024 Daniel Mueller <deso@posteo.net>
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 name: Test
@@ -30,7 +30,7 @@ jobs:
         profile: [dev, release]
     steps:
     - uses: actions/checkout@v4
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ matrix.rust }}
         profile: minimal
@@ -59,11 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: nightly
-        profile: minimal
-        override: true
+    - uses: dtolnay/rust-toolchain@nightly
     - run: |
         echo '```' >> $GITHUB_STEP_SUMMARY
         cargo bench --features=nightly --quiet -- bench_ >> $GITHUB_STEP_SUMMARY
@@ -73,11 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: clippy
-          override: true
+      - uses: dtolnay/rust-toolchain@stable
       - run: |
           cargo clippy --no-deps --tests -- -A unknown_lints -D warnings
           cargo clippy --no-deps --features=readline -- -A unknown_lints -D warnings