diff --git a/cloud/agent/takeover/BUILD.bazel b/cloud/agent/takeover/BUILD.bazel
index 855621a..2727f19 100644
--- a/cloud/agent/takeover/BUILD.bazel
+++ b/cloud/agent/takeover/BUILD.bazel
@@ -9,7 +9,7 @@
     srcs = ["takeover.go"],
     embedsrcs = [
         "//third_party/linux",  #keep
-        ":ucode",  #keep
+        "//third_party:ucode",  #keep
         ":initramfs",  #keep
     ],
     importpath = "source.monogon.dev/cloud/agent/takeover",
@@ -37,7 +37,7 @@
     },
     fsspecs = [
         "//metropolis/node/build:earlydev.fsspec",
-        ":firmware",
+        "//third_party:firmware",
     ],
     visibility = ["//cloud/agent:__subpackages__"],
 )
@@ -48,21 +48,6 @@
     visibility = ["//visibility:public"],
 )
 
-cpio_ucode(
-    name = "ucode",
-    ucode = {
-        "@linux-firmware//:amd_ucode": "AuthenticAMD",
-        "@intel_ucode//:fam6h": "GenuineIntel",
-    },
-)
-
-fsspec_linux_firmware(
-    name = "firmware",
-    firmware_files = ["@linux-firmware//:all_files"],
-    kernel = "//third_party/linux",
-    metadata = "@linux-firmware//:metadata",
-)
-
 # Used by container_images, forces a static build of the test_agent.
 static_binary_tarball(
     name = "takeover_layer",
diff --git a/cloud/agent/takeover/takeover.go b/cloud/agent/takeover/takeover.go
index d313174..ec7e416 100644
--- a/cloud/agent/takeover/takeover.go
+++ b/cloud/agent/takeover/takeover.go
@@ -41,7 +41,7 @@
 //go:embed third_party/linux/bzImage
 var kernel []byte
 
-//go:embed ucode.cpio
+//go:embed third_party/ucode.cpio
 var ucode []byte
 
 //go:embed initramfs.cpio.zst