diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
index 8d096017b..b2226903a 100644
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@@ -73,7 +73,7 @@ def disk_name_for_partition(partition):
     """
     name = os.path.basename(partition["device"])
 
-    if name.startswith("/dev/mmcblk"):
+    if name.startswith("/dev/mmcblk") or name.startswith("/dev/nvme"):
         return re.sub("p[0-9]+$", "", name)
 
     return re.sub("[0-9]+$", "", name)