diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp
index dabcf31..4ea156a 100644
--- a/microdroid_manager/Android.bp
+++ b/microdroid_manager/Android.bp
@@ -27,6 +27,7 @@
 rust_binary {
     name: "microdroid_manager",
     defaults: ["microdroid_manager_defaults"],
+    bootstrap: true,
 }
 
 rust_test {
diff --git a/microdroid_manager/src/metadata.rs b/microdroid_manager/src/metadata.rs
index 86a9e3e..432a134 100644
--- a/microdroid_manager/src/metadata.rs
+++ b/microdroid_manager/src/metadata.rs
@@ -14,15 +14,19 @@
 
 //! Payload metadata from /dev/block/by-name/payload-metadata
 
+use crate::ioutil;
+
 use anyhow::Result;
 use log::info;
 use microdroid_metadata::{read_metadata, Metadata};
-use std::fs::File;
+use std::time::Duration;
 
+const WAIT_TIMEOUT: Duration = Duration::from_secs(10);
 const PAYLOAD_METADATA_PATH: &str = "/dev/block/by-name/payload-metadata";
 
 /// loads payload metadata from /dev/block/by-name/paylaod-metadata
 pub fn load() -> Result<Metadata> {
     info!("loading payload metadata...");
-    read_metadata(File::open(PAYLOAD_METADATA_PATH)?)
+    let file = ioutil::wait_for_file(PAYLOAD_METADATA_PATH, WAIT_TIMEOUT)?;
+    read_metadata(file)
 }