diff --git a/pkgs/clan-cli/clan_cli/api/disk.py b/pkgs/clan-cli/clan_cli/api/disk.py
index 63b50f846..193436100 100644
--- a/pkgs/clan-cli/clan_cli/api/disk.py
+++ b/pkgs/clan-cli/clan_cli/api/disk.py
@@ -32,7 +32,8 @@ def set_single_disk_uuid(
         meta=ServiceMeta(name=instance_name),
         roles=ServiceSingleDiskRole(
             default=ServiceSingleDiskRoleDefault(
-                config=SingleDiskConfig(device=disk_uuid)
+                config=SingleDiskConfig(device=f"/dev/disk/by-id/{disk_uuid}"),
+                machines=[machine_name],
             )
         ),
     )
diff --git a/pkgs/clan-cli/clan_cli/machines/list.py b/pkgs/clan-cli/clan_cli/machines/list.py
index 0ebe9ec5b..0c0ce719a 100644
--- a/pkgs/clan-cli/clan_cli/machines/list.py
+++ b/pkgs/clan-cli/clan_cli/machines/list.py
@@ -103,10 +103,13 @@ def check_machine_online(
             "ssh",
             *(["-i", f"{opts.keyfile}"] if opts and opts.keyfile else []),
             # Disable strict host key checking
-            "-o StrictHostKeyChecking=no",
+            "-o",
+            "StrictHostKeyChecking=no",
             # Disable known hosts file
-            "-o UserKnownHostsFile=/dev/null",
-            f"-o ConnectTimeout={timeout}",
+            "-o",
+            "UserKnownHostsFile=/dev/null",
+            "-o",
+            f"ConnectTimeout={timeout}",
             f"{hostname}",
             "true",
             "&> /dev/null",