diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 69aaff1e1..1884cdf28 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,7 +101,6 @@ jobs:
             echo "website-cfid=ESFTEIYTIP7Y3" | tee -a $GITHUB_OUTPUT
           fi
 
-
   # ----------------------------------------------------------------------------------------------------
   # --- Website Linting -----------------------------------------------------------------------------------
   # ----------------------------------------------------------------------------------------------------
@@ -282,10 +281,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Golang with cache
-        uses: magnetikonline/action-golang-cache@v4
+      - name: Setup Golang
+        uses: actions/setup-go@v5
         with:
-          go-version-file: src/go.mod
+          go-version: 1.21
+          cache: true
+
+      - name: Setup Golang caches
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-golang-
 
       - run: mkdir testlog
 
@@ -298,8 +308,8 @@ jobs:
         env:
           # Set these to a bad value so we don't accidentally fall back to
           # something elsewhere.
-          CORSO_M365_TEST_USER_ID: 'foo'
-          CORSO_SECONDARY_M365_TEST_USER_ID: 'foo'
+          CORSO_M365_TEST_USER_ID: "foo"
+          CORSO_SECONDARY_M365_TEST_USER_ID: "foo"
         run: |
           set -euo pipefail
           go test       \
@@ -495,7 +505,7 @@ jobs:
       - uses: cachix/install-nix-action@v25
       - uses: cachix/cachix-action@v14
         with:
-            name: tree-grepper
+          name: tree-grepper
       - run: nix-env -if https://github.com/BrianHicks/tree-grepper/archive/refs/heads/main.tar.gz
       - name: Run trailing comma lint rule
         run: |
@@ -723,7 +733,14 @@ jobs:
           cfid: ${{ needs.SetEnv.outputs.website-cfid }}
 
   Publish-Website-Prod:
-    needs: [SetEnv, Validate-Linux-Artifacts, Validate-MacOS-Artifacts, Validate-Docker-Artifacts, Validate-Windows-Artifacts]
+    needs:
+      [
+        SetEnv,
+        Validate-Linux-Artifacts,
+        Validate-MacOS-Artifacts,
+        Validate-Docker-Artifacts,
+        Validate-Windows-Artifacts,
+      ]
     environment: ${{ needs.SetEnv.outputs.environment }}
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/')