diff --git a/pkg/hostman/diskutils/fsutils/resizefs.go b/pkg/hostman/diskutils/fsutils/resizefs.go
index eb4a2f6605..11ff509b5a 100644
--- a/pkg/hostman/diskutils/fsutils/resizefs.go
+++ b/pkg/hostman/diskutils/fsutils/resizefs.go
@@ -31,6 +31,9 @@ func (d *SFsutilDriver) GetResizeDevBySerial(diskId string) (string, error) {
 	}
 	lines := strings.Split(string(out), "\n")
 	diskSerial := strings.ReplaceAll(diskId, "-", "")
+	if len(diskSerial) >= 20 {
+		diskSerial = diskSerial[:20]
+	}
 	resizeDev := ""
 	for i := range lines {
 		segs := strings.Fields(lines[i])
diff --git a/pkg/hostman/diskutils/qemu_kvm/driver.go b/pkg/hostman/diskutils/qemu_kvm/driver.go
index e199125517..d0424f68ba 100644
--- a/pkg/hostman/diskutils/qemu_kvm/driver.go
+++ b/pkg/hostman/diskutils/qemu_kvm/driver.go
@@ -698,7 +698,10 @@ func (d *QemuBaseDriver) startCmds(
 
 		cmd += diskDrive
 		serialId := strings.ReplaceAll(diskIds[i], "-", "")
-		deviceId := serialId[:20]
+		if len(serialId) >= 20 {
+			serialId = serialId[:20]
+		}
+		deviceId := serialId
 		cmd += __("-device scsi-hd,drive=drive_%d,bus=scsi.0,id=drive_%d,serial=%s,device_id=%s", i, i, serialId, deviceId)
 	}
 	cmd += __("-drive id=cd0,if=none,media=cdrom,file=%s", DEPLOY_ISO)