diff --git a/src/runtime/virtcontainers/hypervisor.go b/src/runtime/virtcontainers/hypervisor.go
index 53cebe7e35..2c75d7f4a5 100644
--- a/src/runtime/virtcontainers/hypervisor.go
+++ b/src/runtime/virtcontainers/hypervisor.go
@@ -510,6 +510,8 @@ func (conf *HypervisorConfig) valid() error {
 
 	if conf.BlockDeviceDriver == "" {
 		conf.BlockDeviceDriver = defaultBlockDriver
+	} else if conf.BlockDeviceDriver == config.VirtioBlock && conf.HypervisorMachineType == "s390-ccw-virtio" {
+		conf.BlockDeviceDriver = config.VirtioBlockCCW
 	}
 
 	if conf.DefaultMaxVCPUs == 0 {