diff --git a/.github/plugin/setup/action.yml b/.github/plugin/setup/action.yml
index f35974f7..f3e43def 100644
--- a/.github/plugin/setup/action.yml
+++ b/.github/plugin/setup/action.yml
@@ -91,6 +91,15 @@ runs:
         echo "::endgroup::"
       shell: bash
 
+    - name: Install Core Patches
+      if: ${{ always() }}
+      # We should attempt to install a patch, and pass if there isnt one for the branch.
+      run: |
+        git config --global user.email "test@test.com"
+        git config --global user.name "Test"
+        ((test -f plugin/patch/${{ matrix.moodle-branch }}.diff && cd moodle && git am --whitespace=nowarn < ../plugin/patch/${{ matrix.moodle-branch }}.diff) || echo No patch found;)
+      shell: bash
+
     - name: Install Moodle
       run: |
         # Install moodle commands
@@ -104,15 +113,6 @@ runs:
         DB: ${{ matrix.database }}
         MOODLE_BRANCH: ${{ matrix.moodle-branch }}
 
-    - name: Install Core Patches
-      if: ${{ always() }}
-      # We should attempt to install a patch, and pass if there isnt one for the branch.
-      run: |
-        git config --global user.email "test@test.com"
-        git config --global user.name "Test"
-        ((test -f plugin/patch/${{ matrix.moodle-branch }}.diff && cd moodle && git am --whitespace=nowarn < ../plugin/patch/${{ matrix.moodle-branch }}.diff) || echo No patch found;)
-      shell: bash
-
     - name: Run phplint
       if: ${{ always() && inputs.disable_phplint != 'true' }}
       run: moodle-plugin-ci phplint