diff --git a/doc/source/ceph_versions.csv b/doc/source/ceph_versions.csv
index 340f3431e9..00f014a683 100644
--- a/doc/source/ceph_versions.csv
+++ b/doc/source/ceph_versions.csv
@@ -1,5 +1,5 @@
 Distro,Ceph,
 ,Source, Release
 Rocky Linux,CentOS Storage SIG,Quincy
-Ubuntu,Ubuntu Cloud Archive,Quincy
+Ubuntu,Ubuntu,Quincy
 Debian,Debian,Nautilus
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 13629596cc..9eaab37693 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -11,7 +11,6 @@ cron,C,C,C
 cyborg,C,C,C
 designate,C,C,C
 dnsmasq,C,C,C
-elasticsearch,N,C,C
 etcd,C,C,C
 fluentd,C,C,C
 freezer,C,C,C
@@ -25,20 +24,16 @@ horizon,C,C,C
 influxdb,N,C,C
 ironic,C,C,C
 iscsid,C,C,C
-kafka,C,C,C
 keepalived,C,C,C
 keystone,C,C,C
-kibana,N,N,C
 kolla-toolbox,C,C,C
 kuryr,C,C,C
-logstash,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
-monasca,N,N,C
 multipathd,C,C,C
 murano,C,C,C
 neutron,C,C,C
@@ -47,6 +42,7 @@ 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
@@ -57,7 +53,6 @@ sahara,C,C,C
 senlin,C,C,C
 skydive,N,N,N
 solum,C,C,C
-storm,C,C,C
 swift,C,C,C
 tacker,C,C,C
 telegraf,N,N,N
@@ -65,5 +60,4 @@ tgtd,C,C,C
 trove,C,C,C
 vitrage,C,C,C
 watcher,C,C,C
-zookeeper,C,C,C
 zun,C,C,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 4917f7a2d0..2b39969041 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -11,7 +11,6 @@ cron,T,T,T
 cyborg,C,C,C
 designate,C,C,C
 dnsmasq,T,T,C
-elasticsearch,C,C,C
 etcd,T,T,C
 fluentd,T,T,T
 freezer,C,C,C
@@ -26,20 +25,16 @@ horizon,T,T,T
 influxdb,C,C,C
 ironic,T,T,C
 iscsid,T,T,C
-kafka,C,C,C
 keepalived,T,T,C
 keystone,T,T,T
-kibana,C,C,C
 kolla-toolbox,T,T,T
 kuryr,T,T,C
-logstash,C,C,C
 magnum,C,C,C
 manila,C,C,C
 mariadb,T,T,T
 masakari,T,T,C
 memcached,T,T,C
 mistral,T,C,C
-monasca,C,C,N
 multipathd,C,C,C
 murano,C,C,C
 neutron,T,T,T
@@ -47,6 +42,7 @@ neutron-mlnx-agent,C,C,C
 nova,T,T,T
 nova-spicehtml5proxy,N,T,T
 octavia,C,C,C
+opensearch,T,T,C
 openvswitch,T,T,T
 ovn,C,C,C
 ovsdpdk,N,C,C
@@ -58,7 +54,6 @@ sahara,C,C,C
 senlin,C,C,C
 skydive,C,C,C
 solum,C,C,C
-storm,C,C,C
 swift,T,T,C
 tacker,T,C,C
 telegraf,C,C,C
@@ -66,5 +61,4 @@ tgtd,N,T,C
 trove,C,C,C
 vitrage,C,C,C
 watcher,C,C,C
-zookeeper,C,C,C
 zun,T,T,C