diff --git a/app/vmm_console.ml b/app/vmm_console.ml
index 6fb2197..3ec0cc6 100644
--- a/app/vmm_console.ml
+++ b/app/vmm_console.ml
@@ -51,7 +51,7 @@ let read_console name ring channel () =
        Lwt_io.close channel)
 
 let open_fifo name =
-  let fifo = Fpath.(Vmm_core.tmpdir / name + "fifo") in
+  let fifo = Fpath.(Vmm_core.tmpdir / "fifo" / name) in
   Lwt.catch (fun () ->
       Logs.debug (fun m -> m "opening %a for reading" Fpath.pp fifo) ;
       Lwt_io.open_file ~mode:Lwt_io.Input (Fpath.to_string fifo) >>= fun channel ->
diff --git a/src/vmm_unix.ml b/src/vmm_unix.ml
index c2649bc..b30eb65 100644
--- a/src/vmm_unix.ml
+++ b/src/vmm_unix.ml
@@ -59,7 +59,7 @@ let rec mkfifo name =
 
 let image_file, fifo_file =
   ((fun vm -> Fpath.(tmpdir / (vm_id vm) + "img")),
-   (fun vm -> Fpath.(tmpdir / (vm_id vm) + "fifo")))
+   (fun vm -> Fpath.(tmpdir / "fifo" / (vm_id vm))))
 
 let rec fifo_exists file =
   try Ok (Unix.((stat @@ Fpath.to_string file).st_kind = S_FIFO)) with