diff --git a/cloud/BUILD.bazel b/cloud/BUILD.bazel
index ca52bf3..da43c7c 100644
--- a/cloud/BUILD.bazel
+++ b/cloud/BUILD.bazel
@@ -7,6 +7,7 @@
         "gcr.io/monogon-infra/cloud/apigw:{IMAGE_TAG}": "//cloud/apigw:apigw_container",
         "gcr.io/monogon-infra/cloud/shepherd/equinix:{IMAGE_TAG}": "//cloud/shepherd/equinix/manager/server:server_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",
     },
 )
 
diff --git a/cloud/bmaas/scruffy/cmd/BUILD.bazel b/cloud/bmaas/scruffy/cmd/BUILD.bazel
index 5e050bf..cf0391b 100644
--- a/cloud/bmaas/scruffy/cmd/BUILD.bazel
+++ b/cloud/bmaas/scruffy/cmd/BUILD.bazel
@@ -1,4 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+load("@io_bazel_rules_docker//container:container.bzl", "container_image")
+load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
 
 go_library(
     name = "cmd_lib",
@@ -16,3 +18,17 @@
     embed = [":cmd_lib"],
     visibility = ["//visibility:public"],
 )
+
+static_binary_tarball(
+    name = "cmd_layer",
+    executable = ":cmd",
+)
+
+container_image(
+    name = "cmd_container",
+    base = "@go_image_base//image",
+    entrypoint = ["/app/cloud/bmaas/scruffy/cmd/cmd_/cmd"],
+    tars = [":cmd_layer"],
+    visibility = ["//visibility:public"],
+    workdir = "/app",
+)