diff --git a/cloud/shepherd/equinix/manager/server/BUILD.bazel b/cloud/shepherd/equinix/manager/server/BUILD.bazel
index 3917863..173a294 100644
--- a/cloud/shepherd/equinix/manager/server/BUILD.bazel
+++ b/cloud/shepherd/equinix/manager/server/BUILD.bazel
@@ -35,7 +35,7 @@
     entrypoint = ["/app/cloud/shepherd/equinix/manager/server/server_/server"],
     tars = [
         ":server_layer",
-        "//cloud/shepherd/equinix/manager/test_agent:test_agent_layer",
+        "//cloud/takeover:takeover_layer",
     ],
     visibility = ["//visibility:public"],
     workdir = "/app",
diff --git a/cloud/takeover/BUILD.bazel b/cloud/takeover/BUILD.bazel
index 1eb34e2..b51370c 100644
--- a/cloud/takeover/BUILD.bazel
+++ b/cloud/takeover/BUILD.bazel
@@ -1,5 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//metropolis/node/build/mkucode:def.bzl", "cpio_ucode")
+load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
 
 go_library(
     name = "takeover_lib",
@@ -36,3 +37,10 @@
         "@intel_ucode//:fam6h": "GenuineIntel",
     },
 )
+
+# Used by container_images, forces a static build of the test_agent.
+static_binary_tarball(
+    name = "takeover_layer",
+    executable = ":takeover",
+    visibility = ["//visibility:public"],
+)