diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 1a9a217..7b28ad2 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -573,32 +573,3 @@
     name: "microdroid_bootconfig_normal_src",
     srcs: ["bootconfig.normal"],
 }
-
-prebuilt_etc {
-    name: "microdroid_kernel_unsigned",
-    src: "empty_kernel",
-    filename: "microdroid_kernel_unsigned",
-    arch: {
-        arm64: {
-            src: ":microdroid_kernel_prebuilts-5.15-arm64",
-        },
-        x86_64: {
-            src: ":microdroid_kernel_prebuilts-5.15-x86_64",
-        },
-    },
-}
-
-avb_add_hash_footer {
-    name: "microdroid_kernel_signed",
-    src: ":microdroid_kernel_unsigned",
-    filename: "microdroid_kernel",
-    partition_name: "bootloader",
-    private_key: ":microdroid_sign_key",
-    salt: bootloader_salt,
-}
-
-prebuilt_etc {
-    name: "microdroid_kernel",
-    src: ":microdroid_kernel_signed",
-    relative_install_path: "fs",
-}
diff --git a/microdroid/microdroid.json b/microdroid/microdroid.json
index 00cedc8..f02dcbf 100644
--- a/microdroid/microdroid.json
+++ b/microdroid/microdroid.json
@@ -1,9 +1,21 @@
 {
-  "kernel": "/apex/com.android.virt/etc/fs/microdroid_kernel",
+  "bootloader": "/apex/com.android.virt/etc/fs/microdroid_bootloader",
   "disks": [
     {
       "partitions": [
         {
+          "label": "boot_a",
+          "path": "/apex/com.android.virt/etc/fs/microdroid_boot.img"
+        },
+        {
+          "label": "init_boot_a",
+          "path": "/apex/com.android.virt/etc/fs/microdroid_init_boot.img"
+        },
+        {
+          "label": "vendor_boot_a",
+          "path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot.img"
+        },
+        {
           "label": "vbmeta_a",
           "path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta.img"
         },
@@ -13,6 +25,16 @@
         }
       ],
       "writable": false
+    },
+    {
+      "partitions": [
+        {
+          "label": "uboot_env",
+          "path": "/apex/com.android.virt/etc/fs/uboot_env.img",
+          "writable": false
+        }
+      ],
+      "writable": true
     }
   ],
   "memory_mib": 256,