diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 406fc2854d..55f936cbbe 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -1,63 +1,63 @@
 Image,Rocky Linux,Ubuntu,Debian
-aodh,C,C,C
-barbican,C,C,C
+aodh,U,U,U
+barbican,U,U,U
 bifrost,N,N,N
-blazar,C,C,C
-ceilometer,C,C,C
-cinder,C,C,C
-cloudkitty,C,C,C
-collectd,C,C,C
-cron,C,C,C
-cyborg,C,C,C
-designate,C,C,C
-dnsmasq,C,C,C
-etcd,C,C,C
-fluentd,C,C,C
-freezer,C,C,C
-glance,C,C,C
-gnocchi,C,C,C
-grafana,C,C,C
-hacluster,N,C,C
-haproxy,C,C,C
-heat,C,C,C
-horizon,C,C,C
-influxdb,N,C,C
-ironic,C,C,C
-iscsid,C,C,C
-keepalived,C,C,C
-keystone,C,C,C
-kolla-toolbox,C,C,C
-kuryr,C,C,C
-magnum,C,C,C
-manila,C,C,C
-mariadb,C,C,C
-masakari,C,C,C
-memcached,C,C,C
-mistral,C,C,C
-multipathd,C,C,C
-murano,C,C,C
-neutron,C,C,C
-neutron-mlnx-agent,C,C,C
-nova,C,C,C
-nova-spicehtml5proxy,N,C,C
-octavia,C,C,C
-openvswitch,C,C,C
-opensearch,C,C,C
-ovn,C,C,C
-ovsdpdk,N,C,C
-placement,C,C,C
-prometheus,C,C,C
-rabbitmq,C,C,C
-redis,C,C,C
-sahara,C,C,C
-senlin,C,C,C
-skyline,C,C,C
-solum,C,C,C
-swift,C,C,C
-tacker,C,C,C
+blazar,U,U,U
+ceilometer,U,U,U
+cinder,U,U,U
+cloudkitty,U,U,U
+collectd,U,U,U
+cron,U,U,U
+cyborg,U,U,U
+designate,U,U,U
+dnsmasq,U,U,U
+etcd,U,U,U
+fluentd,U,U,U
+freezer,U,U,U
+glance,U,U,U
+gnocchi,U,U,U
+grafana,U,U,U
+hacluster,N,U,U
+haproxy,U,U,U
+heat,U,U,U
+horizon,U,U,U
+influxdb,N,U,U
+ironic,U,U,U
+iscsid,U,U,U
+keepalived,U,U,U
+keystone,U,U,U
+kolla-toolbox,U,U,U
+kuryr,U,U,U
+magnum,U,U,U
+manila,U,U,U
+mariadb,U,U,U
+masakari,U,U,U
+memcached,U,U,U
+mistral,U,U,U
+multipathd,U,U,U
+murano,U,U,U
+neutron,U,U,U
+neutron-mlnx-agent,U,U,U
+nova,U,U,U
+nova-spicehtml5proxy,N,U,U
+octavia,U,U,U
+openvswitch,U,U,U
+opensearch,U,U,U
+ovn,U,U,U
+ovsdpdk,N,U,U
+placement,U,U,U
+prometheus,U,U,U
+rabbitmq,U,U,U
+redis,U,U,U
+sahara,U,U,U
+senlin,U,U,U
+skyline,U,U,U
+solum,U,U,U
+swift,U,U,U
+tacker,U,U,U
 telegraf,N,N,N
-tgtd,C,C,C
-trove,C,C,C
-vitrage,C,C,C
-watcher,C,C,C
-zun,C,C,C
+tgtd,U,U,U
+trove,U,U,U
+vitrage,U,U,U
+watcher,U,U,U
+zun,U,U,U
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 8be1e55676..9c1fa03683 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -1,64 +1,64 @@
 Image,Rocky Linux,Ubuntu,Debian
-aodh,C,C,C
-barbican,T,C,C
-bifrost,T,C,C
-blazar,C,C,C
-ceilometer,C,C,C
-cinder,T,T,C
-cloudkitty,C,C,C
-collectd,C,C,C
+aodh,U,U,U
+barbican,T,U,U
+bifrost,T,U,U
+blazar,U,U,U
+ceilometer,U,U,U
+cinder,T,T,U
+cloudkitty,U,U,U
+collectd,U,U,U
 cron,T,T,T
-cyborg,C,C,C
-designate,C,C,C
-dnsmasq,T,T,C
-etcd,T,T,C
+cyborg,U,U,U
+designate,U,U,U
+dnsmasq,T,T,U
+etcd,T,T,U
 fluentd,T,T,T
-freezer,C,C,C
+freezer,U,U,U
 glance,T,T,T
-gnocchi,C,C,C
-grafana,C,C,C
-hacluster,C,C,C
-hacluster-pcs,N,C,C
-haproxy,T,T,C
+gnocchi,U,U,U
+grafana,U,U,U
+hacluster,U,U,U
+hacluster-pcs,N,U,U
+haproxy,T,T,U
 heat,T,T,T
 horizon,T,T,T
-influxdb,C,C,C
-ironic,T,T,C
-iscsid,T,T,C
-keepalived,T,T,C
+influxdb,U,U,U
+ironic,T,T,U
+iscsid,T,T,U
+keepalived,T,T,U
 keystone,T,T,T
 kolla-toolbox,T,T,T
-kuryr,T,T,C
-magnum,C,C,C
-manila,C,C,C
+kuryr,T,T,U
+magnum,U,U,U
+manila,U,U,U
 mariadb,T,T,T
-masakari,T,T,C
-memcached,T,T,C
-mistral,T,C,C
-multipathd,C,C,C
-murano,C,C,C
+masakari,T,T,U
+memcached,T,T,U
+mistral,T,U,U
+multipathd,U,U,U
+murano,U,U,U
 neutron,T,T,T
-neutron-mlnx-agent,C,C,C
+neutron-mlnx-agent,U,U,U
 nova,T,T,T
 nova-spicehtml5proxy,N,T,T
-octavia,C,C,C
-opensearch,T,T,C
+octavia,U,U,U
+opensearch,T,T,U
 openvswitch,T,T,T
-ovn,C,C,C
-ovsdpdk,N,C,C
+ovn,U,U,U
+ovsdpdk,N,U,U
 placement,T,T,T
-prometheus,C,C,C
+prometheus,U,U,U
 rabbitmq,T,T,T
-redis,T,C,C
-sahara,C,C,C
-senlin,C,C,C
-skyline,C,C,C
-solum,C,C,C
-swift,T,T,C
-tacker,T,C,C
-telegraf,C,C,C
-tgtd,N,T,C
-trove,C,C,C
-vitrage,C,C,C
-watcher,C,C,C
-zun,T,T,C
+redis,T,U,U
+sahara,U,U,U
+senlin,U,U,U
+skyline,U,U,U
+solum,U,U,U
+swift,T,T,U
+tacker,T,U,U
+telegraf,U,U,U
+tgtd,N,T,U
+trove,U,U,U
+vitrage,U,U,U
+watcher,U,U,U
+zun,T,T,U
diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst
index fdffbd3f2d..b2dc5ff3e5 100644
--- a/doc/source/support_matrix.rst
+++ b/doc/source/support_matrix.rst
@@ -44,12 +44,14 @@ Coverage:
 * CI in ``kolla-ansible`` is testing that images are functional
 * kolla core team is maintaining versions
 
-C - Community maintained
-------------------------
+U - Untested
+------------
 
 Coverage:
 
-* supported by the broader community (not core team) or not supported at all
+* CI in ``kolla-ansible`` is *NOT* testing that images are functional
+* Many untested services are working fine, but the kolla core team cannot
+  guarantee that they are all functional
 
 N - Not Available/Unknown
 -------------------------