diff --git a/disk/format-chosen.sh b/disk/format-chosen.sh
index 0132a1ba..e575ec6f 100644
--- a/disk/format-chosen.sh
+++ b/disk/format-chosen.sh
@@ -70,6 +70,10 @@ elif partprobe /dev/sdb &>/dev/null;
 then
     SYSNAME="machines"
     DEVTYPE=sdb
+elif partprobe /dev/nvme0n1  &>/dev/null;
+then
+    SYSNAME="NVMe"
+    DEVTYPE=nvme0n1
 else
     msg_box "It seems like you didn't add a second disk. 
 To be able to put the DATA on a second drive formatted as ZFS you need to add a second disk to this server.
diff --git a/disk/format-sdb.sh b/disk/format-sdb.sh
index 48be3227..8ea8ad5c 100644
--- a/disk/format-sdb.sh
+++ b/disk/format-sdb.sh
@@ -70,6 +70,10 @@ elif partprobe /dev/sdb &>/dev/null;
 then
     SYSNAME="machines"
     DEVTYPE=sdb
+elif partprobe /dev/nvme0n1  &>/dev/null;
+then
+    SYSNAME="NVMe"
+    DEVTYPE=nvme0n1
 else
     msg_box "It seems like you didn't add a second disk. 
 To be able to put the DATA on a second drive formatted as ZFS you need to add a second disk to this server.