diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index dc9a4bb..8ff2b36 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -158,7 +158,28 @@
             deps: ["virt_device_prebuilts_kernel_modules-5.10-x86_64"],
         },
     },
+    deps: [
+        "microdroid_fstab",
+    ],
+    base_dir: "first_stage_ramdisk",
     type: "compressed_cpio",
+    symlinks: [
+        {
+            target: "etc/fstab",
+            name: "first_stage_ramdisk/fstab.microdroid",
+        },
+        {
+            target: "first_stage_ramdisk/lib",
+            name: "lib",
+        },
+    ],
+}
+
+prebuilt_etc {
+    name: "microdroid_fstab",
+    src: "fstab",
+    filename: "fstab",
+    installable: false,
 }
 
 prebuilt_etc {
diff --git a/microdroid/fstab b/microdroid/fstab
new file mode 100644
index 0000000..5887451
--- /dev/null
+++ b/microdroid/fstab
@@ -0,0 +1 @@
+/dev/block/by-name/super /system ext4 noatime,ro,errors=panic wait,first_stage_mount
diff --git a/microdroid/uboot-env.txt b/microdroid/uboot-env.txt
index 0ef66b8..cdd2c19 100644
--- a/microdroid/uboot-env.txt
+++ b/microdroid/uboot-env.txt
@@ -1,7 +1,11 @@
 # Static u-boot environment variables for microdroid. See b/180481192
 
+# Boot the device following the Android boot procedure
 bootcmd=boot_android virtio -
 
+# Kernel commandlines
+bootargs=rdinit=/bin/init_vendor panic=-1 androidboot.first_stage_console=1 androidboot.hardware=microdroid androidboot.boot_devices=10000.pci
+
 # 0:2 is the misc partition
 bootdevice=0:2
 bootdelay=0