diff --git a/.claude/skills/backport/SKILL.md b/.claude/skills/backport/SKILL.md
index 80d0666d12db..a0b6407642f8 100644
--- a/.claude/skills/backport/SKILL.md
+++ b/.claude/skills/backport/SKILL.md
@@ -147,7 +147,7 @@ git diff --name-only | grep -v '^yarn-project/' || true
 
 If changes exist outside yarn-project, run bootstrap from the repo root:
 ```bash
-BOOTSTRAP_TO=yarn-project ./bootstrap.sh
+./bootstrap.sh build yarn-project
 ```
 
 Fix any build errors that arise from the backport adaptation.
diff --git a/bootstrap.sh b/bootstrap.sh
index e03d8a879c8e..01918cd9def2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -827,7 +827,7 @@ case "$cmd" in
   "ci-docs")
     export CI=1
     export USE_TEST_CACHE=1
-    BOOTSTRAP_TO=yarn-project ./bootstrap.sh
+    ./bootstrap.sh build yarn-project
     docs/bootstrap.sh ci
     ;;
   "ci-barretenberg-debug")
diff --git a/container-builds/avm-fuzzing-container/src/Dockerfile b/container-builds/avm-fuzzing-container/src/Dockerfile
index 9c508e5faa9b..fd3cfea877eb 100644
--- a/container-builds/avm-fuzzing-container/src/Dockerfile
+++ b/container-builds/avm-fuzzing-container/src/Dockerfile
@@ -32,7 +32,7 @@ RUN git clone https://github.com/AztecProtocol/aztec-packages.git --depth 1 --br
 WORKDIR /root/aztec-packages
 
 # Run bootstrap up to yarn-project (release-image needs docker which isn't available)
-RUN BOOTSTRAP_TO=yarn-project ./bootstrap.sh
+RUN ./bootstrap.sh build yarn-project
 
 # Build the tx fuzzer
 WORKDIR /root/aztec-packages/barretenberg/cpp
diff --git a/yarn-project/.claude/skills/fix-pr/SKILL.md b/yarn-project/.claude/skills/fix-pr/SKILL.md
index 15df2bb38577..bfc822c1ad8c 100644
--- a/yarn-project/.claude/skills/fix-pr/SKILL.md
+++ b/yarn-project/.claude/skills/fix-pr/SKILL.md
@@ -69,7 +69,7 @@ git diff origin/<base-branch>...HEAD --name-only | grep -v '^yarn-project/'
 
 If yes, run bootstrap:
 ```bash
-(cd $(git rev-parse --show-toplevel) && BOOTSTRAP_TO=yarn-project ./bootstrap.sh)
+(cd $(git rev-parse --show-toplevel) && ./bootstrap.sh build yarn-project)
 ```
 
 ### Phase 4: Fix Based on Failure Type
diff --git a/yarn-project/.claude/skills/rebase-pr/SKILL.md b/yarn-project/.claude/skills/rebase-pr/SKILL.md
index 5bf3e731536f..ab57da396c56 100644
--- a/yarn-project/.claude/skills/rebase-pr/SKILL.md
+++ b/yarn-project/.claude/skills/rebase-pr/SKILL.md
@@ -69,7 +69,7 @@ git diff origin/<base-branch>...HEAD --name-only | grep -v '^yarn-project/'
 
 If yes, run bootstrap from repo root:
 ```bash
-(cd $(git rev-parse --show-toplevel) && BOOTSTRAP_TO=yarn-project ./bootstrap.sh)
+(cd $(git rev-parse --show-toplevel) && ./bootstrap.sh build yarn-project)
 ```
 
 ### Step 5: Verify Build
diff --git a/yarn-project/CLAUDE.md b/yarn-project/CLAUDE.md
index 961cad2a13fc..db8e14659e89 100644
--- a/yarn-project/CLAUDE.md
+++ b/yarn-project/CLAUDE.md
@@ -54,7 +54,7 @@ Git commands work from any subdirectory of a repo—there is no need to `cd` to
 - Rebasing on a branch that has changes outside `yarn-project`
 
 ```bash
-(cd $(git rev-parse --show-toplevel) && BOOTSTRAP_TO=yarn-project ./bootstrap.sh)
+(cd $(git rev-parse --show-toplevel) && ./bootstrap.sh build yarn-project)
 ```
 
 Bootstrap takes several minutes to run. Be patient.