diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
index e461b7edf9..9b018b801b 100644
--- a/virtcontainers/qemu.go
+++ b/virtcontainers/qemu.go
@@ -1115,8 +1115,8 @@ func (q *qemu) hotplugAddCPUs(amount uint32) (uint32, error) {
 		coreID := fmt.Sprintf("%d", hc.Properties.Core)
 		threadID := fmt.Sprintf("%d", hc.Properties.Thread)
 
-		// If CPU type is IBM pSeries, we do not set socketID and threadID
-		if machine.Type == "pseries" {
+		// If CPU type is IBM pSeries or Z, we do not set socketID and threadID
+		if machine.Type == "pseries" || machine.Type == "s390-ccw-virtio" {
 			socketID = ""
 			threadID = ""
 		}