diff --git a/contrib/agrarian-build-menu.sh b/contrib/agrarian-build-menu.sh
index 9786cb65..753d7366 100755
--- a/contrib/agrarian-build-menu.sh
+++ b/contrib/agrarian-build-menu.sh
@@ -482,9 +482,9 @@ ensure_repo() {
   if [[ -d "$WORKDIR/.git" ]]; then
     ROOT="$WORKDIR"
     run_step 25 "Fetching existing Agrarian checkout" git -C "$ROOT" fetch origin "$BRANCH"
-    run_step 27 "Resetting local checkout files" git -C "$ROOT" reset --hard HEAD
-    run_step 30 "Checking out $BRANCH" git -C "$ROOT" checkout "$BRANCH"
-    run_step 35 "Fast-forwarding $BRANCH" git -C "$ROOT" pull --ff-only origin "$BRANCH"
+    run_step 30 "Checking out $BRANCH" git -C "$ROOT" checkout -B "$BRANCH" "origin/$BRANCH"
+    run_step 35 "Resetting checkout to origin/$BRANCH" git -C "$ROOT" reset --hard "origin/$BRANCH"
+    run_step 37 "Removing local untracked checkout files" git -C "$ROOT" clean -fd
   else
     mkdir -p "$(dirname "$WORKDIR")"
     run_step 35 "Cloning Agrarian into $WORKDIR" git clone --branch "$BRANCH" "$REPO_URL" "$WORKDIR"