diff --git a/bases/bazel/go/BUILD b/bases/bazel/go/BUILD
index 546c1aa..c7a793f 100644
--- a/bases/bazel/go/BUILD
+++ b/bases/bazel/go/BUILD
@@ -8,29 +8,34 @@ container_image(
         "//platforms:s390x": "@go_base_s390x//image",
         "//platforms:ppc64le": "@go_base_ppc64le//image",
     }),
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
 container_image(
     name = "go_arm64",
     base = "@go_base_arm64//image",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
 container_image(
     name = "go_amd64",
     base = "@go_base_amd64//image",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
 container_image(
     name = "go_s390x",
     base = "@go_base_s390x//image",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
 container_image(
     name = "go_ppc64le",
     base = "@go_base_ppc64le//image",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
diff --git a/bases/build/BUILD b/bases/build/BUILD
index 5b0914d..ff3b11f 100644
--- a/bases/build/BUILD
+++ b/bases/build/BUILD
@@ -3,24 +3,28 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_image")
 container_image(
     name = "build_arm64",
     base = "@build_base_arm64//image",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
 container_image(
     name = "build_amd64",
     base = "@build_base_amd64//image",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
 container_image(
     name = "build_s390x",
     base = "@build_base_s390x//image",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
 container_image(
     name = "build_ppc64le",
     base = "@build_base_ppc64le//image",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
@@ -32,5 +36,6 @@ container_image(
         "//platforms:s390x": "@build_base_s390x//image",
         "//platforms:ppc64le": "@build_base_ppc64le//image",
     }),
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
diff --git a/initdb/BUILD.bazel b/initdb/BUILD.bazel
index 1596823..603a4ef 100644
--- a/initdb/BUILD.bazel
+++ b/initdb/BUILD.bazel
@@ -21,8 +21,15 @@ go_library(
 go_binary(
     name = "initdb",
     embed = [":initdb_lib"],
+    visibility = ["//visibility:public"],
+)
+
+go_binary(
+    name = "initdb_amd64",
+    embed = [":initdb_lib"],
     goarch = "amd64",
     goos = "linux",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
@@ -31,6 +38,7 @@ go_binary(
     embed = [":initdb_lib"],
     goarch = "arm64",
     goos = "linux",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
@@ -39,6 +47,7 @@ go_binary(
     embed = [":initdb_lib"],
     goarch = "s390x",
     goos = "linux",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
@@ -47,6 +56,7 @@ go_binary(
     embed = [":initdb_lib"],
     goarch = "ppc64le",
     goos = "linux",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
@@ -54,7 +64,7 @@ container(
     architecture = "amd64",
     base = "//bases/bazel/go:go_amd64",
     files = [
-        ":initdb",
+        ":initdb_amd64",
     ],
     image_name = "initdb",
 )
diff --git a/peridot/cmd/v1/peridotbuilder/BUILD.bazel b/peridot/cmd/v1/peridotbuilder/BUILD.bazel
index a2b008c..a0dbbfa 100644
--- a/peridot/cmd/v1/peridotbuilder/BUILD.bazel
+++ b/peridot/cmd/v1/peridotbuilder/BUILD.bazel
@@ -28,11 +28,18 @@ go_library(
     ],
 )
 
+go_binary(
+    name = "peridotbuilder",
+    embed = [":peridotbuilder_lib"],
+    visibility = ["//visibility:public"],
+)
+
 go_binary(
     name = "peridotbuilder_amd64",
     embed = [":peridotbuilder_lib"],
     goarch = "amd64",
     goos = "linux",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
@@ -41,6 +48,7 @@ go_binary(
     embed = [":peridotbuilder_lib"],
     goarch = "arm64",
     goos = "linux",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
@@ -49,6 +57,7 @@ go_binary(
     embed = [":peridotbuilder_lib"],
     goarch = "s390x",
     goos = "linux",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
 
@@ -57,5 +66,6 @@ go_binary(
     embed = [":peridotbuilder_lib"],
     goarch = "ppc64le",
     goos = "linux",
+    tags = ["manual"],
     visibility = ["//visibility:public"],
 )
diff --git a/rules_byc/internal/container/container.bzl b/rules_byc/internal/container/container.bzl
index 3a17648..adc2ed0 100644
--- a/rules_byc/internal/container/container.bzl
+++ b/rules_byc/internal/container/container.bzl
@@ -29,7 +29,7 @@ def container(image_name, files, tars_to_layer = [], base = "//bases/bazel/go",
             tars = tars_to_layer,
             visibility = [":__subpackages__"],
         )
-        extra_layers += [layer_name]
+        extra_layers.append(layer_name)
 
     if not architecture:
         container_image(