diff --git a/build/print-workspace-status.py b/build/print-workspace-status.py
index 457c164..70e6e58 100755
--- a/build/print-workspace-status.py
+++ b/build/print-workspace-status.py
@@ -56,14 +56,8 @@
 if sde is not None:
     build_timestamp = int(sde)
 
-# Image tag to use in rules_docker. Since USER might not be set on CI, we have
-# to craft this ourselves.
-user = os.environ.get("USER", "unknown")
-image_tag = f"{user}-{build_timestamp}"
-
 variables["STABLE_MONOGON_gitCommit"] = git_commit
 variables["STABLE_MONOGON_gitTreeState"] = git_tree_state
-variables["IMAGE_TAG"] = image_tag
 
 # Per product. Each product has it's own semver-style version number, which is
 # deduced from git tags.
@@ -228,13 +222,6 @@
 variables["STABLE_KUBERNETES_gitMinor"] = kubernetes_version_parsed[2]
 variables["STABLE_KUBERNETES_gitVersion"] = kubernetes_version + "+mngn"
 
-# Backwards compat with existing stamping data as expected by the monorepo codebase.
-# TODO(q3k): remove this once we migrate away into the new versioning data format in metropolis.
-variables["STABLE_METROPOLIS_gitCommit"] = variables["STABLE_MONOGON_gitCommit"]
-variables["STABLE_METROPOLIS_gitTreeState"] = variables["STABLE_MONOGON_gitTreeState"]
-# Skip the 'v.'.
-variables["STABLE_METROPOLIS_version"] = variables["STABLE_MONOGON_metropolis_version"][1:].split('-')[0]
-
 # Emit variables to stdout for consumption by Bazel and targets.
 for key in sorted(variables.keys()):
     print("{} {}".format(key, variables[key]))
diff --git a/cloud/BUILD.bazel b/cloud/BUILD.bazel
index a9363ef..0e44a88 100644
--- a/cloud/BUILD.bazel
+++ b/cloud/BUILD.bazel
@@ -4,11 +4,11 @@
 container_bundle(
     name = "cloud_containers",
     images = {
-        "gcr.io/monogon-infra/cloud/apigw:{IMAGE_TAG}": "//cloud/apigw:apigw_container",
-        "gcr.io/monogon-infra/cloud/shepherd/equinix:{IMAGE_TAG}": "//cloud/shepherd/provider/equinix:equinix_container",
-        "gcr.io/monogon-infra/cloud/bmsrv:{IMAGE_TAG}": "//cloud/bmaas/server/cmd:cmd_container",
-        "gcr.io/monogon-infra/cloud/scruffy:{IMAGE_TAG}": "//cloud/bmaas/scruffy/cmd:cmd_container",
-        "gcr.io/monogon-infra/cloud/shepherd/mini:{IMAGE_TAG}": "//cloud/shepherd/mini:mini_container",
+        "gcr.io/monogon-infra/cloud/apigw:{STABLE_MONOGON_cloud_version}": "//cloud/apigw:apigw_container",
+        "gcr.io/monogon-infra/cloud/shepherd/equinix:{STABLE_MONOGON_cloud_version}": "//cloud/shepherd/provider/equinix:equinix_container",
+        "gcr.io/monogon-infra/cloud/bmsrv:{STABLE_MONOGON_cloud_version}": "//cloud/bmaas/server/cmd:cmd_container",
+        "gcr.io/monogon-infra/cloud/scruffy:{STABLE_MONOGON_cloud_version}": "//cloud/bmaas/scruffy/cmd:cmd_container",
+        "gcr.io/monogon-infra/cloud/shepherd/mini:{STABLE_MONOGON_cloud_version}": "//cloud/shepherd/mini:mini_container",
     },
 )
 
diff --git a/metropolis/installer/BUILD.bazel b/metropolis/installer/BUILD.bazel
index 400b98e..3b4144c 100644
--- a/metropolis/installer/BUILD.bazel
+++ b/metropolis/installer/BUILD.bazel
@@ -44,7 +44,7 @@
     name = "installer-release-info",
     os_id = "metropolis-installer",
     os_name = "Metropolis Installer",
-    stamp_var = "STABLE_METROPOLIS_version",
+    stamp_var = "STABLE_MONOGON_metropolis_version",
 )
 
 efi_unified_kernel_image(
diff --git a/metropolis/node/BUILD.bazel b/metropolis/node/BUILD.bazel
index f207107..ba5103c 100644
--- a/metropolis/node/BUILD.bazel
+++ b/metropolis/node/BUILD.bazel
@@ -198,5 +198,5 @@
     name = "os-release-info",
     os_id = "metropolis-node",
     os_name = "Metropolis Node",
-    stamp_var = "STABLE_METROPOLIS_version",
+    stamp_var = "STABLE_MONOGON_metropolis_version",
 )