diff --git a/cloud/shepherd/equinix/manager/server/BUILD.bazel b/cloud/shepherd/equinix/manager/server/BUILD.bazel
index 43ab529..3917863 100644
--- a/cloud/shepherd/equinix/manager/server/BUILD.bazel
+++ b/cloud/shepherd/equinix/manager/server/BUILD.bazel
@@ -33,7 +33,10 @@
     name = "server_container",
     base = "@go_image_base//image",
     entrypoint = ["/app/cloud/shepherd/equinix/manager/server/server_/server"],
-    tars = [":server_layer"],
+    tars = [
+        ":server_layer",
+        "//cloud/shepherd/equinix/manager/test_agent:test_agent_layer",
+    ],
     visibility = ["//visibility:public"],
     workdir = "/app",
 )
diff --git a/cloud/shepherd/equinix/manager/test_agent/BUILD.bazel b/cloud/shepherd/equinix/manager/test_agent/BUILD.bazel
index 8f03070..699082d 100644
--- a/cloud/shepherd/equinix/manager/test_agent/BUILD.bazel
+++ b/cloud/shepherd/equinix/manager/test_agent/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
 
 go_binary(
     name = "test_agent",
@@ -18,3 +19,10 @@
         "@org_golang_google_protobuf//proto",
     ],
 )
+
+# Used by container_images, forces a static build of the test_agent.
+static_binary_tarball(
+    name = "test_agent_layer",
+    executable = ":test_agent",
+    visibility = ["//visibility:public"],
+)