diff --git a/cloud/agent/BUILD.bazel b/cloud/agent/BUILD.bazel
index 8f96663..dd54619 100644
--- a/cloud/agent/BUILD.bazel
+++ b/cloud/agent/BUILD.bazel
@@ -16,12 +16,12 @@
     deps = [
         "//cloud/agent/api",
         "//cloud/bmaas/server/api",
-        "//metropolis/node/build/mkimage/osimage",
         "//metropolis/node/core/devmgr",
         "//metropolis/node/core/network",
         "//net/proto",
         "//osbase/blockdev",
         "//osbase/bootparam",
+        "//osbase/build/mkimage/osimage",
         "//osbase/efivarfs",
         "//osbase/logtree",
         "//osbase/nvme",
diff --git a/cloud/agent/install.go b/cloud/agent/install.go
index 66cd236..2eaeeb3 100644
--- a/cloud/agent/install.go
+++ b/cloud/agent/install.go
@@ -14,9 +14,9 @@
 	"google.golang.org/protobuf/proto"
 
 	bpb "source.monogon.dev/cloud/bmaas/server/api"
-	"source.monogon.dev/metropolis/node/build/mkimage/osimage"
 	npb "source.monogon.dev/net/proto"
 	"source.monogon.dev/osbase/blockdev"
+	"source.monogon.dev/osbase/build/mkimage/osimage"
 	"source.monogon.dev/osbase/efivarfs"
 	"source.monogon.dev/osbase/logtree"
 )
diff --git a/cloud/agent/takeover/BUILD.bazel b/cloud/agent/takeover/BUILD.bazel
index 49e12ac..8594e4c 100644
--- a/cloud/agent/takeover/BUILD.bazel
+++ b/cloud/agent/takeover/BUILD.bazel
@@ -1,8 +1,8 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("//metropolis/node/build/mkucode:def.bzl", "cpio_ucode")
+load("//osbase/build/mkucode:def.bzl", "cpio_ucode")
 load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
-load("//metropolis/node/build:def.bzl", "node_initramfs")
-load("//metropolis/node/build/fwprune:def.bzl", "fsspec_linux_firmware")
+load("//osbase/build:def.bzl", "node_initramfs")
+load("//osbase/build/fwprune:def.bzl", "fsspec_linux_firmware")
 
 go_library(
     name = "takeover_lib",
@@ -36,7 +36,7 @@
         "@cacerts//file": "/etc/ssl/cert.pem",
     },
     fsspecs = [
-        "//metropolis/node/build:earlydev.fsspec",
+        "//osbase/build:earlydev.fsspec",
         "//third_party:firmware",
     ],
     visibility = ["//cloud/agent:__subpackages__"],