diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 2f33006..728dd02 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -18,16 +18,13 @@ runs:
           curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash -
           sudo apt-get install -y nodejs
 
-    - name: Checkout branch
-      uses: actions/checkout@v2
-
     - name: Setup default Rust toolchain
       # Use this helper action so we get matcher support
       # https://github.com/actions-rust-lang/setup-rust-toolchain/pull/15
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         components: clippy, rustfmt, rust-src
-        toolchain: ${{ matrix.toolchain }}
+        toolchain: ${{ inputs.toolchain }}
 
     - name: Install build tools for host
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b44782..b0bfc23 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,6 +27,9 @@ jobs:
     runs-on: ubuntu-latest
     container: devkitpro/devkitarm
     steps:
+      - name: Checkout branch
+        uses: actions/checkout@v2
+
       - uses: ./.github/actions/setup
         with:
           toolchain: ${{ matrix.toolchain }}
@@ -51,6 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     container: devkitpro/devkitarm
     steps:
+      - name: Checkout branch
+        uses: actions/checkout@v2
+
       - uses: ./.github/actions/setup
         with:
           toolchain: ${{ matrix.toolchain }}