diff --git a/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh b/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh
index 3efe131b7ab2..78555e77baec 100755
--- a/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh
+++ b/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh
@@ -99,8 +99,12 @@ case "$component" in
     artifacts=("pkg/cmd/roachtest/roachtest_/roachtest:bin/roachtest.$os-$arch")
     ;;
   roachprod)
-      # Roachprod binary.
-      bazel_args=(//pkg/cmd/roachprod --crdb_test)
+      # Roachprod binary. This binary is only built here to support the logic
+      # behind `roachprod update`. Hence, we do not need to add `--crdb_test` to
+      # the build command 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")
       ;;
   *)