diff --git a/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh b/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh
index 3efe131b7ab2..2a56f6ce4542 100755
--- a/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh
+++ b/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh
@@ -100,7 +100,12 @@ case "$component" in
     ;;
   roachprod)
       # Roachprod binary.
-      bazel_args=(//pkg/cmd/roachprod --crdb_test)
+      # This binary is built to support the logic behind `roachprod update`.
+      # Hence, we do not need to add `--crdb_test` to the build args as we do
+      # for `roachtest`. Adding the build flag causes the binary to log
+      # metamorphic vars on each command invocation, which is not ideal from a
+      # user experience perspective.
+      bazel_args=(//pkg/cmd/roachprod)
       artifacts=("pkg/cmd/roachprod/roachprod_/roachprod:bin/roachprod.$os-$arch")
       ;;
   *)