diff --git a/apex/Android.bp b/apex/Android.bp
index fb8de4c..0f30c67 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -3,16 +3,12 @@
 }
 
 microdroid_filesystem_images = [
-    "microdroid_boot-5.10",
-    "microdroid_bootconfig_app_debuggable",
-    "microdroid_bootconfig_full_debuggable",
-    "microdroid_bootconfig_normal",
-    "microdroid_init_boot",
     "microdroid_super",
-    "microdroid_uboot_env",
+    "microdroid_boot-5.10",
+    "microdroid_init_boot",
+    "microdroid_vendor_boot-5.10",
     "microdroid_vbmeta",
     "microdroid_vbmeta_bootconfig",
-    "microdroid_vendor_boot-5.10",
 ]
 
 apex {
@@ -64,8 +60,12 @@
     prebuilts: [
         "com.android.virt.init.rc",
         "microdroid.json",
+        "microdroid_uboot_env",
         "microdroid_bootloader",
         "microdroid_bootloader.avbpubkey",
+        "microdroid_bootconfig_normal",
+        "microdroid_bootconfig_app_debuggable",
+        "microdroid_bootconfig_full_debuggable",
     ],
     file_contexts: ":com.android.virt-file_contexts",
     canned_fs_config: "canned_fs_config",