diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 73549bf..25a5ee5 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -13,12 +13,13 @@ jobs:
         platform: [ ubuntu-latest ]
     runs-on: ${{ matrix.platform }}
     steps:
+      # Checkout should always be before setup-go to ensure caching is working
+      - name: Checkout
+        uses: actions/checkout@v4
       - name: Install Go
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Checkout
-        uses: actions/checkout@v4
       - name: Install plugin
         run: make install-plugin
       - name: Build binaries
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 87457c8..56877ac 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -12,14 +12,20 @@ jobs:
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
+      # Checkout should always be before setup-go to ensure caching is working
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
       - name: Install Go
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Checkout
-        uses: actions/checkout@v4
+
+      - name: Install Go
+        uses: actions/setup-go@v3
         with:
-          fetch-depth: 1
+          go-version: ${{ matrix.go-version }}
       - name: Build binaries
         run: make build
       - name: Run unit tests
@@ -32,13 +38,20 @@ jobs:
         platform: [ ubuntu-latest ]
     runs-on: ${{ matrix.platform }}
     steps:
+      # Checkout should always be before setup-go to ensure caching is working
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
       - name: Install Go
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Checkout
-        uses: actions/checkout@v4
+
+      - name: Install Go
+        uses: actions/setup-go@v3
         with:
-          fetch-depth: 1
+          go-version: ${{ matrix.go-version }}
       - name: Generate
         run: make generate