diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh
index 446fb355f3..aa7ee0ff43 100755
--- a/scripts/build-setup.sh
+++ b/scripts/build-setup.sh
@@ -309,6 +309,8 @@ if run_step "8"; then
         exit_if_last_command_failed
     fi
     popd
+    # Ensure FireMarshal CLI is on PATH in env.sh (idempotent)
+    replace_content env.sh build-setup-marshal "# line auto-generated by build-setup.sh\n__DIR=\"$CYDIR\"\nPATH=\\$__DIR/software/firemarshal:\\$PATH"
 fi
 
 if run_step "10"; then
diff --git a/scripts/init-submodules-no-riscv-tools-nolog.sh b/scripts/init-submodules-no-riscv-tools-nolog.sh
index 22959d1a53..50cbf63701 100755
--- a/scripts/init-submodules-no-riscv-tools-nolog.sh
+++ b/scripts/init-submodules-no-riscv-tools-nolog.sh
@@ -29,7 +29,7 @@ trap 'error_handler $LINENO "$submodule_name"' ERR
 function usage
 {
     echo "Usage: $0 <options>"
-    echo "Initialize Chipyard submodules and setup initial env.sh script."
+    echo "Initialize Chipyard submodules"
     echo "By default, this will only initialize minimally required submodules"
     echo "Enable other submodules with the --full or submodule-specific flags"
     echo ""
@@ -241,7 +241,3 @@ cd "$RDIR"
 if [ ! -f ./software/firemarshal/marshal-config.yaml ]; then
   echo "firesim-dir: '../../sims/firesim/'" > ./software/firemarshal/marshal-config.yaml
 fi
-
-replace_content env.sh init-submodules "# line auto-generated by init-submodules-no-riscv-tools.sh
-__DIR=\"$RDIR\"
-PATH=\$__DIR/software/firemarshal:\$PATH"