diff --git a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
index 73a1f7e835..fee8520286 100755
--- a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
+++ b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
@@ -216,6 +216,12 @@ doconfigure () {
             fi
             partnum=`expr $partnum + 1`
             partdev=$dev$partnum
+
+           # need to handle nvme device name, nvme0n1 so partnum is nvme0n1p1
+           if [[ $dev == *"nvme"* ]]; then
+                 partdev=${dev}p$partnum
+           fi
+
             echo "Create filesystem $fstype on $partdev" >>$LOG
             echo "mkfs.$fstype -f -q $partdev" >>$LOG
             `mkfs.$fstype -f -q $partdev  > /dev/null`