diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 76f604133d..a056a1be7e 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -28,15 +28,18 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Toolchain
-        uses: actions-rs/toolchain@v1
+        uses: oxidecomputer/actions-rs_toolchain@oxide/master
+        # see https://github.com/actions-rs/toolchain/pull/209
+        # uses: actions-rs/toolchain@v1
         with:
           override: true
           profile: minimal
           target: ${{ matrix.target }}
-          toolchain: stable
 
       - name: Cache
         uses: Swatinem/rust-cache@v1
+        with:
+          key: ${{ matrix.target }}
 
       - name: Compile
         uses: actions-rs/cargo@v1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c38365c30c..12417b0ddc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,11 +29,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@568dc894a7f9e32ffd9bb7d7a6cebb784cdaa2b0
+      - name: Setup Toolchain
+        uses: oxidecomputer/actions-rs_toolchain@oxide/master
+        # see https://github.com/actions-rs/toolchain/pull/209
+        # uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
-          components: rustfmt
+          override: true
           profile: minimal
+          target: ${{ matrix.target }}
       - uses: actions-rs/cargo@4ff6ec2846f6e7217c1a9b0b503506665f134c4b
         with:
           command: fmt
@@ -50,9 +53,14 @@ jobs:
     runs-on: ${{matrix.os}}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@568dc894a7f9e32ffd9bb7d7a6cebb784cdaa2b0
+      - name: Setup Toolchain
+        uses: oxidecomputer/actions-rs_toolchain@oxide/master
+        # see https://github.com/actions-rs/toolchain/pull/209
+        # uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          override: true
+          profile: minimal
+          target: ${{ matrix.target }}
       - uses: Swatinem/rust-cache@1232abb8968faf344409165de17cbf9e7f340fd8
       - uses: actions-rs/cargo@4ff6ec2846f6e7217c1a9b0b503506665f134c4b
         with:
@@ -82,10 +90,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@568dc894a7f9e32ffd9bb7d7a6cebb784cdaa2b0
+      - name: Setup Toolchain
+        uses: oxidecomputer/actions-rs_toolchain@oxide/master
+        # see https://github.com/actions-rs/toolchain/pull/209
+        # uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          override: true
           profile: minimal
+          target: ${{ matrix.target }}
       - run: rustup component add clippy
       - uses: Swatinem/rust-cache@1232abb8968faf344409165de17cbf9e7f340fd8
       - uses: actions-rs/clippy-check@9d09632661e31982c0be8af59aeb96b680641bc4