diff --git a/.bazelrc b/.bazelrc
index 20817443f7b9..ab6acb8445de 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -75,9 +75,10 @@ build:crosslinuxarmbase --config=cross
 # NB: This is consumed in `BUILD` files (see build/toolchains/BUILD.bazel).
 build:devdarwinx86_64 --platforms=//build/toolchains:darwin_x86_64
 build:devdarwinx86_64 --config=dev
-build:dev --stamp --workspace_status_command=./build/bazelutil/stamp.sh
+build:dev --workspace_status_command=./build/bazelutil/stamp.sh
 build:dev --action_env=PATH
 build:dev --host_action_env=PATH
+build:dev --spawn_strategy=local --strategy=Genrule=sandboxed
 
 try-import %workspace%/.bazelrc.user
 
diff --git a/pkg/cmd/dev/doctor.go b/pkg/cmd/dev/doctor.go
index 5cd2bb97c4a5..707e5db2f7c8 100644
--- a/pkg/cmd/dev/doctor.go
+++ b/pkg/cmd/dev/doctor.go
@@ -223,7 +223,6 @@ Please perform the following steps:
 	}
 	if failedStampTestMsg != "" {
 		failedStampTestMsg = failedStampTestMsg + fmt.Sprintf(`
-This may be because your Bazel is not configured to "stamp" built executables.
 Make sure one of the following lines is in the file %s/.bazelrc.user:
 `, workspace)
 		if runtime.GOOS == "darwin" && runtime.GOARCH == "amd64" {