diff --git a/doc/source/user/feature-matrix-gp.ini b/doc/source/user/feature-matrix-gp.ini
index 26cd61d2ba63..cd37ac0ef586 100644
--- a/doc/source/user/feature-matrix-gp.ini
+++ b/doc/source/user/feature-matrix-gp.ini
@@ -34,6 +34,10 @@ link=https://wiki.openstack.org/wiki/NovaVMware/Minesweeper
 title=Hyper-V CI
 link=https://wiki.openstack.org/wiki/ThirdPartySystems/Hyper-V_CI
 
+[target.zvm]
+title=IBM zVM CI
+link=https://wiki.openstack.org/wiki/ThirdPartySystems/IBM_z/VM_CI
+
 [target.ironic]
 title=Ironic CI
 link=
@@ -77,6 +81,7 @@ vmware=complete
 hyperv=complete
 ironic=unknown
 powervm=complete
+zvm=complete
 
 [operation.snapshot-server]
 title=Snapshot Server
@@ -98,6 +103,7 @@ vmware=unknown
 hyperv=unknown
 ironic=unknown
 powervm=complete
+zvm=complete
 
 [operation.power-ops]
 title=Server power ops
@@ -118,6 +124,7 @@ vmware=complete
 hyperv=complete
 ironic=unknown
 powervm=complete
+zvm=complete
 
 [operation.rebuild-server]
 title=Rebuild Server
@@ -138,6 +145,7 @@ vmware=complete
 hyperv=complete
 ironic=unknown
 powervm=missing
+zvm=missing
 
 [operation.resize-server]
 title=Resize Server
@@ -158,6 +166,7 @@ vmware=complete
 hyperv=complete
 ironic=unknown
 powervm=missing
+zvm=missing
 
 [operation.server-volume-ops]
 title=Volume Operations
@@ -179,6 +188,7 @@ ironic=missing
 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.
+zvm=missing
 
 [operation.server-bdm]
 title=Custom disk configurations on boot
@@ -203,6 +213,7 @@ driver-notes-vmware=This is not tested in a CI system, but it is implemented.
 hyperv=complete:n
 ironic=missing
 powervm=missing
+zvm=missing
 
 [operation.server-neutron]
 title=Custom neutron configurations on boot
@@ -228,6 +239,8 @@ hyperv=partial
 driver-notes-hyperv=This is not tested in a CI system, but it is implemented.
 ironic=missing
 powervm=complete
+zvm=partial
+driver-notes-zvm=This is not tested in a CI system, but it is implemented.
 
 [operation.server-pause]
 title=Pause a Server
@@ -249,6 +262,7 @@ driver-notes-vmware=This is not tested in a CI system, but it is implemented.
 hyperv=complete
 ironic=missing
 powervm=missing
+zvm=complete
 
 [operation.server-suspend]
 title=Suspend a Server
@@ -270,6 +284,7 @@ vmware=complete
 hyperv=complete
 ironic=missing
 powervm=missing
+zvm=missing
 
 [operation.server-consoleoutput]
 title=Server console output
@@ -291,6 +306,7 @@ hyperv=partial
 driver-notes-hyperv=This is not tested in a CI system, but it is implemented.
 ironic=missing
 powervm=complete
+zvm=complete
 
 [operation.server-rescue]
 title=Server Rescue
@@ -313,6 +329,7 @@ hyperv=partial
 driver-notes-hyperv=This is not tested in a CI system, but it is implemented.
 ironic=missing
 powervm=missing
+zvm=missing
 
 [operation.server-configdrive]
 title=Server Config Drive
@@ -335,6 +352,7 @@ hyperv=complete
 ironic=partial
 driver-notes-ironic=This is not tested in a CI system, but it is implemented.
 powervm=complete
+zvm=complete
 
 [operation.server-changepassword]
 title=Server Change Password
@@ -357,6 +375,7 @@ hyperv=partial
 driver-notes-hyperv=This is not tested in a CI system, but it is implemented.
 ironic=missing
 powervm=missing
+zvm=missing
 
 [operation.server-shelve]
 title=Server Shelve and Unshelve
@@ -378,3 +397,4 @@ vmware=missing
 hyperv=complete
 ironic=missing
 powervm=missing
+zvm=missing