diff --git a/subiquity/models/filesystem.py b/subiquity/models/filesystem.py
index d64def7c..957c6fe5 100644
--- a/subiquity/models/filesystem.py
+++ b/subiquity/models/filesystem.py
@@ -626,15 +626,15 @@ class Dasd:
 @fsobj("disk")
 class Disk(_Device):
     ptable: Optional[str] = attributes.ptable()
-    serial: str = None
-    wwn: str = None
-    multipath: str = None
-    path: str = None
+    serial: Optional[str] = None
+    wwn: Optional[str] = None
+    multipath: Optional[str] = None
+    path: Optional[str] = None
     wipe: Optional[str] = None
-    preserve: str = False
+    preserve: bool = False
     name: str = ""
     grub_device: bool = False
-    device_id: str = None
+    device_id: Optional[str] = None
 
     _info: StorageInfo = attributes.for_api()
     _has_in_use_partition: bool = attributes.for_api(default=False)