diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 9282ff46..850acce0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -68,7 +68,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Update apt repositories
-        if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf'
+        if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'aarch64-unknown-linux-gnu'
         run: sudo apt-get update
 
       - name: Install AArch64 target toolchain
@@ -80,21 +80,25 @@ jobs:
         run: sudo apt-get install musl-tools
 
       - name: Install Toolchain
-        uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 # pin@oxide/master
+        uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
         with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-          profile: minimal
-          override: true
+          toolchain: 1.88.0
+          targets: ${{ matrix.target }}
 
       - name: Cache
         uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2
 
       - name: Build
         run: RUSTFLAGS="${{ matrix.rustflags }}" cargo build --target ${{ matrix.target }} --release
+        shell: bash
 
-      - name: Rename artifact
-        run: mv target/${{ matrix.target }}/release/squawk* target/release/${{ matrix.artifact_name }}
+      - name: Rename artifact (windows)
+        if: matrix.target == 'x86_64-pc-windows-msvc'
+        run: mv target/${{ matrix.target }}/release/squawk.exe target/release/${{ matrix.artifact_name }}
+
+      - name: Rename artifact (linux, mac)
+        if: matrix.target != 'x86_64-pc-windows-msvc'
+        run: mv target/${{ matrix.target }}/release/squawk target/release/${{ matrix.artifact_name }}
 
       - name: Artifact
         uses: actions/upload-artifact@v4
@@ -231,17 +235,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Toolchain
-        uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 # pin@oxide/master
+        uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
+        with:
+          toolchain: 1.88.0
+          components: clippy, rustfmt
 
       - name: Cache
         uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2
 
-      - name: Install Rust Fmt
-        run: rustup component add rustfmt
-
-      - name: Install Clippy
-        run: rustup component add clippy
-
       - name: Get Clippy Version
         run: cargo clippy --version
 
@@ -259,7 +260,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Toolchain
-        uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 # pin@oxide/master
+        uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
+        with:
+          toolchain: 1.88.0
 
       - name: Cache
         uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2