diff --git a/pkg/driver/qemu/qemu.go b/pkg/driver/qemu/qemu.go
index ee7456d7b2c..c139348a5a6 100644
--- a/pkg/driver/qemu/qemu.go
+++ b/pkg/driver/qemu/qemu.go
@@ -751,7 +751,7 @@ func Cmdline(ctx context.Context, cfg Config) (exe string, args []string, err er
 	// cloud-init
 	args = append(args,
 		"-drive", "id=cdrom0,if=none,format=raw,readonly=on,file="+filepath.Join(cfg.InstanceDir, filenames.CIDataISO),
-		"-device", "virtio-scsi-pci,id=scsi0",
+		"-device", "virtio-scsi,id=scsi0",
 		"-device", "scsi-cd,bus=scsi0.0,drive=cdrom0")
 
 	// Kernel
diff --git a/templates/_images/opensuse-leap-16.yaml b/templates/_images/opensuse-leap-16.yaml
index 33088b48564..67df67e23f3 100644
--- a/templates/_images/opensuse-leap-16.yaml
+++ b/templates/_images/opensuse-leap-16.yaml
@@ -7,6 +7,5 @@ images:
 - location: https://download.opensuse.org/distribution/leap/16.0/appliances/Leap-16.0-Minimal-VM.aarch64-Cloud.qcow2
   arch: aarch64
 
-# s390x image will not boot until https://bugzilla.suse.com/show_bug.cgi?id=1252096 is resolved
 - location: https://download.opensuse.org/distribution/leap/16.0/appliances/Leap-16.0-Minimal-VM.s390x-s390x-Cloud.qcow2
   arch: s390x