diff --git a/tools/deployment/multinode/grafana-selenium.sh b/tools/deployment/multinode/600-grafana-selenium.sh
similarity index 100%
rename from tools/deployment/multinode/grafana-selenium.sh
rename to tools/deployment/multinode/600-grafana-selenium.sh
diff --git a/tools/deployment/multinode/nagios-selenium.sh b/tools/deployment/multinode/610-nagios-selenium.sh
similarity index 100%
rename from tools/deployment/multinode/nagios-selenium.sh
rename to tools/deployment/multinode/610-nagios-selenium.sh
diff --git a/tools/deployment/multinode/prometheus-selenium.sh b/tools/deployment/multinode/620-prometheus-selenium.sh
similarity index 100%
rename from tools/deployment/multinode/prometheus-selenium.sh
rename to tools/deployment/multinode/620-prometheus-selenium.sh
diff --git a/tools/deployment/multinode/kibana-selenium.sh b/tools/deployment/multinode/630-kibana-selenium.sh
similarity index 100%
rename from tools/deployment/multinode/kibana-selenium.sh
rename to tools/deployment/multinode/630-kibana-selenium.sh
diff --git a/tools/deployment/osh-infra-logging/kibana-selenium.sh b/tools/deployment/osh-infra-logging/600-kibana-selenium.sh
similarity index 100%
rename from tools/deployment/osh-infra-logging/kibana-selenium.sh
rename to tools/deployment/osh-infra-logging/600-kibana-selenium.sh
diff --git a/tools/deployment/osh-infra-monitoring/grafana-selenium.sh b/tools/deployment/osh-infra-monitoring/600-grafana-selenium.sh
similarity index 100%
rename from tools/deployment/osh-infra-monitoring/grafana-selenium.sh
rename to tools/deployment/osh-infra-monitoring/600-grafana-selenium.sh
diff --git a/tools/deployment/osh-infra-monitoring/prometheus-selenium.sh b/tools/deployment/osh-infra-monitoring/610-prometheus-selenium.sh
similarity index 100%
rename from tools/deployment/osh-infra-monitoring/prometheus-selenium.sh
rename to tools/deployment/osh-infra-monitoring/610-prometheus-selenium.sh
diff --git a/tools/deployment/osh-infra-monitoring/nagios-selenium.sh b/tools/deployment/osh-infra-monitoring/620-nagios-selenium.sh
similarity index 100%
rename from tools/deployment/osh-infra-monitoring/nagios-selenium.sh
rename to tools/deployment/osh-infra-monitoring/620-nagios-selenium.sh
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 95b331d03..98075b49f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -62,11 +62,10 @@
         - ./tools/deployment/multinode/120-elasticsearch.sh
         - ./tools/deployment/multinode/130-fluent-logging.sh
         - ./tools/deployment/multinode/140-kibana.sh
-        - ./tools/deployment/multinode/grafana-selenium.sh
-        - ./tools/deployment/multinode/nagios-selenium.sh
-        - ./tools/deployment/multinode/prometheus-selenium.sh
-        # NOTE(srwilkers): Add '|| true' until we enable some wait mechanism
-        - ./tools/deployment/multinode/kibana-selenium.sh || true
+        - ./tools/deployment/multinode/600-grafana-selenium.sh
+        - ./tools/deployment/multinode/610-nagios-selenium.sh
+        - ./tools/deployment/multinode/620-prometheus-selenium.sh
+        - ./tools/deployment/multinode/630-kibana-selenium.sh
 
 - job:
     name: openstack-helm-infra-tenant-ceph
@@ -130,8 +129,7 @@
         - ./tools/deployment/osh-infra-logging/055-elasticsearch-ldap.sh
         - ./tools/deployment/osh-infra-logging/060-fluent-logging.sh
         - ./tools/deployment/osh-infra-logging/070-kibana.sh
-        # NOTE(srwilkers): Add '|| true' until we enable some wait mechanism
-        - ./tools/deployment/osh-infra-logging/kibana-selenium.sh || true
+        - ./tools/deployment/osh-infra-logging/600-kibana-selenium.sh
 
 - job:
     name: openstack-helm-infra-aio-monitoring
@@ -157,12 +155,11 @@
         - ./tools/deployment/osh-infra-monitoring/070-kube-state-metrics.sh
         - ./tools/deployment/osh-infra-monitoring/080-node-exporter.sh
         - ./tools/deployment/osh-infra-monitoring/090-process-exporter.sh
-        - ./tools/deployment/osh-infra-monitoring/100-openstack-exporter.sh
         - ./tools/deployment/osh-infra-monitoring/110-grafana.sh
         - ./tools/deployment/osh-infra-monitoring/120-nagios.sh
-        - ./tools/deployment/osh-infra-monitoring/grafana-selenium.sh
-        - ./tools/deployment/osh-infra-monitoring/prometheus-selenium.sh
-        - ./tools/deployment/osh-infra-monitoring/nagios-selenium.sh
+        - ./tools/deployment/osh-infra-monitoring/600-grafana-selenium.sh
+        - ./tools/deployment/osh-infra-monitoring/610-prometheus-selenium.sh
+        - ./tools/deployment/osh-infra-monitoring/620-nagios-selenium.sh
 
 - job:
     name: openstack-helm-infra-aio-network-policy