diff --git a/device-usage/block/config.ml b/device-usage/block/config.ml
index 2c3ca47..27c751a 100644
--- a/device-usage/block/config.ml
+++ b/device-usage/block/config.ml
@@ -4,6 +4,7 @@ open Mirage
 let main = main "Unikernel.Main" (block @-> job)
 
 let img =
-  if_impl Key.is_solo5 (block_of_file "storage") (block_of_file "disk.img")
+  if_impl Key.is_solo5 (block_of_file "storage")
+    (if_impl Key.is_unikraft (block_of_file "0") (block_of_file "disk.img"))
 
 let () = register "block_test" [ main $ img ]
diff --git a/device-usage/disk-lottery/config.ml b/device-usage/disk-lottery/config.ml
index 6b018b0..c3e3d91 100644
--- a/device-usage/disk-lottery/config.ml
+++ b/device-usage/disk-lottery/config.ml
@@ -6,6 +6,7 @@ let main =
     ~packages:[ package "checkseum"; package "cstruct"; package "fmt" ]
 
 let img =
-  if_impl Key.is_solo5 (block_of_file "storage") (block_of_file "disk.img")
+  if_impl Key.is_solo5 (block_of_file "storage")
+    (if_impl Key.is_unikraft (block_of_file "0") (block_of_file "disk.img"))
 
 let () = register "lottery" [ main $ img ]