diff --git a/.github/workflows/tests-and-lints-template.yaml b/.github/workflows/tests-and-lints-template.yaml
index 947695d..6c10017 100644
--- a/.github/workflows/tests-and-lints-template.yaml
+++ b/.github/workflows/tests-and-lints-template.yaml
@@ -89,10 +89,17 @@ jobs:
       - name: Install git
         run: sudo apt update && sudo apt install -y git
 
-      - name: Checkout
+      - name: Checkout PR (from fork or branch)
+        if: github.event_name == 'pull_request'
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
-          ref: ${{ github.event_name == 'pull_request' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }}
+          ref: refs/pull/${{ github.event.pull_request.number }}/head
+
+      - name: Checkout push branch (main or other)
+        if: github.event_name != 'pull_request'
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          ref: ${{ github.ref }}
 
       - name: Setup git to use https
         run: |