diff --git a/cloud/agent/BUILD.bazel b/cloud/agent/BUILD.bazel
index 48e7d20..a25ea38 100644
--- a/cloud/agent/BUILD.bazel
+++ b/cloud/agent/BUILD.bazel
@@ -14,11 +14,11 @@
     visibility = ["//visibility:private"],
     deps = [
         "//cloud/agent/api",
+        "//metropolis/installer/install",
         "//metropolis/node/core/devmgr",
         "//metropolis/node/core/network",
         "//osbase/blockdev",
         "//osbase/bringup",
-        "//osbase/build/mkimage/osimage",
         "//osbase/efivarfs",
         "//osbase/net/proto",
         "//osbase/nvme",
diff --git a/cloud/agent/install.go b/cloud/agent/install.go
index e212d9a..949a9a7 100644
--- a/cloud/agent/install.go
+++ b/cloud/agent/install.go
@@ -18,10 +18,10 @@
 	apb "source.monogon.dev/cloud/agent/api"
 	npb "source.monogon.dev/osbase/net/proto"
 
+	metropolisInstall "source.monogon.dev/metropolis/installer/install"
 	"source.monogon.dev/osbase/blockdev"
-	"source.monogon.dev/osbase/build/mkimage/osimage"
 	"source.monogon.dev/osbase/efivarfs"
-	ociosimage "source.monogon.dev/osbase/oci/osimage"
+	"source.monogon.dev/osbase/oci/osimage"
 	"source.monogon.dev/osbase/oci/registry"
 	"source.monogon.dev/osbase/structfs"
 	"source.monogon.dev/osbase/supervisor"
@@ -80,7 +80,7 @@
 		return fmt.Errorf("failed to fetch OS image: %w", err)
 	}
 
-	osImage, err := ociosimage.Read(image)
+	osImage, err := osimage.Read(image)
 	if err != nil {
 		return fmt.Errorf("failed to fetch OS image: %w", err)
 	}
@@ -106,8 +106,8 @@
 		return fmt.Errorf("failed to open root device: %w", err)
 	}
 
-	installParams := osimage.Params{
-		PartitionSize: osimage.PartitionSizeInfo{
+	installParams := metropolisInstall.Params{
+		PartitionSize: metropolisInstall.PartitionSizeInfo{
 			ESP:    384,
 			System: 4096,
 			Data:   128,
@@ -120,7 +120,7 @@
 		Output:         rootDev,
 	}
 
-	be, err := osimage.Write(&installParams)
+	be, err := metropolisInstall.Write(&installParams)
 	if err != nil {
 		return err
 	}