diff --git a/doc/source/user/support-matrix.ini b/doc/source/user/support-matrix.ini
index e8bc8783959f..699fac7778a8 100644
--- a/doc/source/user/support-matrix.ini
+++ b/doc/source/user/support-matrix.ini
@@ -113,6 +113,9 @@ title=Ironic
 [driver.powervm]
 title=PowerVM
 
+[driver.zvm]
+title=zVM
+
 [operation.attach-volume]
 title=Attach block volume to instance
 status=optional
@@ -141,6 +144,7 @@ driver.libvirt-vz-ct=missing
 driver.powervm=complete
 driver-notes.powervm=This is not tested for every CI run. Add a
   "powervm:volume-check" comment to trigger a CI job running volume tests.
+driver.zvm=missing
 
 [operation.attach-tagged-volume]
 title=Attach tagged block device to instance
@@ -162,6 +166,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.detach-volume]
 title=Detach block volume from instance
@@ -184,6 +189,7 @@ driver.libvirt-vz-ct=missing
 driver.powervm=complete
 driver-notes.powervm=This is not tested for every CI run. Add a
   "powervm:volume-check" comment to trigger a CI job running volume tests.
+driver.zvm=missing
 
 [operation.extend-volume]
 title=Extend block volume attached to instance
@@ -213,6 +219,7 @@ driver.libvirt-vz-ct=missing
 driver.powervm=complete
 driver-notes.powervm=This is not tested for every CI run. Add a
   "powervm:volume-check" comment to trigger a CI job running volume tests.
+driver.zvm=missing
 
 [operation.attach-interface]
 title=Attach virtual network interface to instance
@@ -242,6 +249,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=missing
 
 [operation.attach-tagged-interface]
 title=Attach tagged virtual network interface to instance
@@ -263,6 +271,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.detach-interface]
 title=Detach virtual network interface from instance
@@ -286,6 +295,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=missing
 
 [operation.maintenance-mode]
 title=Set the host in a maintenance mode
@@ -312,6 +322,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.evacuate]
 title=Evacuate instances from a host
@@ -339,6 +350,7 @@ driver.ironic=unknown
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=unknown
 
 [operation.rebuild]
 title=Rebuild instance
@@ -363,6 +375,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=missing
+driver.zvm=unknown
 
 [operation.get-guest-info]
 title=Guest instance status
@@ -386,6 +399,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=complete
 
 [operation.get-host-uptime]
 title=Guest host uptime
@@ -407,6 +421,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=complete
 
 [operation.get-host-ip]
 title=Guest host ip
@@ -428,6 +443,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=complete
 
 [operation.live-migrate]
 title=Live migrate instance across hosts
@@ -459,6 +475,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.force-live-migration-to-complete]
 title=Force live migration to complete
@@ -492,6 +509,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.launch]
 title=Launch instance
@@ -514,6 +532,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=complete
 
 [operation.pause]
 title=Stop instance CPUs (pause)
@@ -542,6 +561,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=complete
 
 [operation.reboot]
 title=Reboot instance
@@ -566,6 +586,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=complete
 
 [operation.rescue]
 title=Rescue instance
@@ -593,6 +614,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.resize]
 title=Resize instance
@@ -622,6 +644,7 @@ driver-notes.vz-vm=Resizing Virtuozzo instances implies guest filesystem resize
 driver.libvirt-vz-ct=complete
 driver-notes.vz-ct=Resizing Virtuozzo instances implies guest filesystem resize also
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.resume]
 title=Restore instance
@@ -642,6 +665,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.set-admin-password]
 title=Set instance admin password
@@ -677,6 +701,7 @@ driver-notes.libvirt-vz-vm=Requires libvirt>=2.0.0
 driver.libvirt-vz-ct=complete
 driver-notes.libvirt-vz-ct=Requires libvirt>=2.0.0
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.snapshot]
 title=Save snapshot of instance disk
@@ -711,6 +736,7 @@ driver-notes.powervm=When using the localdisk disk driver, snapshot is only
   supported if I/O is being hosted by the management partition. If hosting I/O
   on traditional VIOS, we are limited by the fact that a VSCSI device can't be
   mapped to two partitions (the VIOS and the management) at once.
+driver.zvm=complete
 
 [operation.suspend]
 title=Suspend instance
@@ -745,6 +771,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.swap-volume]
 title=Swap block volumes
@@ -772,6 +799,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.terminate]
 title=Shutdown instance
@@ -799,6 +827,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=complete
 
 [operation.trigger-crash-dump]
 title=Trigger crash dump
@@ -823,6 +852,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.unpause]
 title=Resume instance CPUs (unpause)
@@ -843,6 +873,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=missing
+driver.zvm=complete
 
 [guest.disk.autoconfig]
 title=Auto configure disk
@@ -865,6 +896,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=complete
 
 [guest.disk.rate-limit]
 title=Instance disk I/O limits
@@ -890,6 +922,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [guest.setup.configdrive]
 title=Config drive support
@@ -919,6 +952,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=missing
 driver.powervm=complete
+driver.zvm=complete
 
 [guest.setup.inject.file]
 title=Inject files into disk image
@@ -947,6 +981,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [guest.setup.inject.networking]
 title=Inject guest networking config
@@ -980,6 +1015,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [console.rdp]
 title=Remote desktop over RDP
@@ -1007,6 +1043,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [console.serial.log]
 title=View serial console logs
@@ -1035,6 +1072,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=complete
 
 [console.serial.interactive]
 title=Remote interactive serial console
@@ -1064,6 +1102,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [console.spice]
 title=Remote desktop over SPICE
@@ -1091,6 +1130,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [console.vnc]
 title=Remote desktop over VNC
@@ -1118,6 +1158,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=missing
 
 [storage.block]
 title=Block storage support
@@ -1149,6 +1190,7 @@ driver.libvirt-vz-ct=missing
 driver.powervm=complete
 driver-notes.powervm=This is not tested for every CI run. Add a
   "powervm:volume-check" comment to trigger a CI job running volume tests.
+driver.zvm=missing
 
 [storage.block.backend.fibrechannel]
 title=Block storage over fibre channel
@@ -1174,6 +1216,7 @@ driver.libvirt-vz-ct=missing
 driver.powervm=complete
 driver-notes.powervm=This is not tested for every CI run. Add a
   "powervm:volume-check" comment to trigger a CI job running volume tests.
+driver.zvm=missing
 
 [storage.block.backend.iscsi]
 title=Block storage over iSCSI
@@ -1200,6 +1243,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [storage.block.backend.iscsi.auth.chap]
 title=CHAP authentication for iSCSI
@@ -1223,6 +1267,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [storage.image]
 title=Image storage support
@@ -1248,6 +1293,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=complete
 
 [networking.firewallrules]
 title=Network firewall rules
@@ -1268,6 +1314,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=missing
 
 [networking.routing]
 title=Network routing
@@ -1288,6 +1335,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=missing
 
 [networking.securitygroups]
 title=Network security groups
@@ -1315,6 +1363,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=missing
 
 [networking.topology.flat]
 title=Flat networking
@@ -1338,6 +1387,7 @@ driver.ironic=complete
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=complete
 
 [networking.topology.vlan]
 title=VLAN networking
@@ -1360,6 +1410,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=complete
+driver.zvm=complete
 
 [operation.uefi-boot]
 title=uefi boot
@@ -1381,6 +1432,7 @@ driver-notes.ironic=depends on hardware support
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.device-tags]
 title=Device tags
@@ -1412,6 +1464,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=unknown
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.quiesce]
 title=quiesce
@@ -1434,6 +1487,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.unquiesce]
 title=unquiesce
@@ -1454,6 +1508,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.multiattach-volume]
 title=Attach block volume to multiple instances
@@ -1479,6 +1534,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.trusted-certs]
 title=Validate image with trusted certificates
@@ -1503,6 +1559,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=complete
 driver.libvirt-vz-ct=complete
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.file-backed-memory]
 title=File backed memory
@@ -1527,6 +1584,7 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing
 
 [operation.report-cpu-traits]
 title=Report CPU traits
@@ -1549,3 +1607,4 @@ driver.ironic=missing
 driver.libvirt-vz-vm=missing
 driver.libvirt-vz-ct=missing
 driver.powervm=missing
+driver.zvm=missing