diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bd129840..2edba39f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -26,7 +26,7 @@ contributing to this repository.
       [references AEPs](https://aep.dev/style-guide#referencing-aeps)
       correctly.
 - [ ] [My code has been formatted](https://aep.dev/contributing#formatting)
-  (run `make lint`)
+      (run `make lint`)
 
 <!-- uncomment this if PR is for a new AEP
 
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index bb7aeb08..bb2bd0b9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     container: node:24
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Generate all static pages, and build site.
         run: ./scripts/build.sh
diff --git a/scripts/build.sh b/scripts/build.sh
index 96daa7c7..eb75e2bf 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,10 +1,22 @@
 #!/usr/bin/env bash
-set -x
+set -euo pipefail
 export AEP_LOCATION="${PWD}"
 export SG_DIRECTORY="/tmp/site-generator"
+export SG_REPO_URL="${SG_REPO_URL:-https://github.com/infusionsoft/aep-site-generator.git}"
 
 if [ ! -d "${SG_DIRECTORY}" ]; then
-    git clone git@github.com:infusionsoft/aep-site-generator.git "${SG_DIRECTORY}"
+    git clone "${SG_REPO_URL}" "${SG_DIRECTORY}"
+else
+    # Keep local builds aligned with the latest upstream state.
+    git -C "${SG_DIRECTORY}" remote set-url origin "${SG_REPO_URL}"
+    if ! git -C "${SG_DIRECTORY}" pull --ff-only; then
+        echo "Error: unable to fast-forward ${SG_DIRECTORY}." >&2
+        echo "This usually means local changes or branch divergence in the cached checkout." >&2
+        echo "Fix it by resetting the cache or reconciling the repo, then rerun build:" >&2
+        echo "  rm -rf \"${SG_DIRECTORY}\"" >&2
+        echo "  ./scripts/build.sh" >&2
+        exit 1
+    fi
 fi
 
 cd "${SG_DIRECTORY}" || exit