diff --git a/docs/infrastructure-ovn-setup.md b/docs/infrastructure-ovn-setup.md
index b4ce0c29..3d50aaeb 100644
--- a/docs/infrastructure-ovn-setup.md
+++ b/docs/infrastructure-ovn-setup.md
@@ -90,20 +90,3 @@ kubectl apply -k /opt/genestack/kustomize/ovn
 
 After running the setup, nodes will have the label `ovn.openstack.org/configured` with a date stamp when it was configured.
 If there's ever a need to reconfigure a node, simply remove the label and the DaemonSet will take care of it automatically.
-
-## Validation our infrastructure is operational
-
-Before going any further make sure you validate that the backends are operational.
-
-``` shell
-# MariaDB
-kubectl --namespace openstack get mariadbs
-
-#RabbitMQ
-kubectl --namespace openstack get rabbitmqclusters.rabbitmq.com
-
-# Memcached
-kubectl --namespace openstack get horizontalpodautoscaler.autoscaling memcached
-```
-
-Once everything is Ready and online. Continue with the installation.
diff --git a/mkdocs.yml b/mkdocs.yml
index 5474238a..f13b5bb2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -117,14 +117,15 @@ nav:
                                       - MariaDB Deployment: infrastructure-mariadb.md
                                       - MySQL Exporter: prometheus-mysql-exporter.md
                               - PostgreSQL: infrastructure-postgresql.md
-                              - RabbitMQ: infrastructure-rabbitmq.md
+                              - RabbitMQ:
+                                      - RabbitMQ Deployment: infrastructure-rabbitmq.md
+                                      - RabbitMQ Exporter: prometheus-rabbitmq-exporter.md
                               - Memcached: infrastructure-memcached.md
                               - Libvirt: infrastructure-libvirt.md
                               - OVN:
                                       - OVN Overview: infrastructure-ovn.md
                                       - OVN Setup: infrastructure-ovn-setup.md
                               - MetalLB: infrastructure-metallb.md
-                              - RabbitMQ Exporter: prometheus-rabbitmq-exporter.md
                       - OpenStack:
                               - OpenStack Overview: openstack-overview.md
                               - OpenStack Preparations: openstack-helm-make.md