diff --git a/cloud/agent/install.go b/cloud/agent/install.go
index 1ad60fc..9ada49b 100644
--- a/cloud/agent/install.go
+++ b/cloud/agent/install.go
@@ -27,7 +27,7 @@
 	"source.monogon.dev/osbase/supervisor"
 )
 
-//go:embed metropolis/node/abloader/abloader_bin.efi
+//go:embed metropolis/node/abloader/abloader.efi
 var abloader []byte
 
 // install dispatches OSInstallationRequests to the appropriate installer
diff --git a/cloud/agent/takeover/BUILD.bazel b/cloud/agent/takeover/BUILD.bazel
index a884f6b..e1ba2a6 100644
--- a/cloud/agent/takeover/BUILD.bazel
+++ b/cloud/agent/takeover/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
-load("//osbase/build:def.bzl", "build_static_target")
 load("//osbase/build/genproductinfo:defs.bzl", "product_info")
 load("//osbase/build/mkcpio:def.bzl", "node_initramfs")
 
@@ -28,22 +27,15 @@
 )
 
 go_binary(
-    name = "takeover_bin",
-    embed = [":takeover_lib"],
-    visibility = ["//visibility:private"],
-)
-
-# Used by e2e tests, forces a static build
-build_static_target(
     name = "takeover",
-    dep = ":takeover_bin",
+    embed = [":takeover_lib"],
     visibility = ["//visibility:public"],
 )
 
 # Used by container_images, forces a static build
 static_binary_tarball(
     name = "takeover_layer",
-    executable = ":takeover_bin",
+    executable = ":takeover",
     visibility = ["//visibility:public"],
 )