diff --git a/.zuul.yaml b/.zuul.yaml
index 5bf5865169..4199f9caf4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -170,7 +170,7 @@
 # Jitsi-meet jobs
 - job:
     name: system-config-build-image-jitsi-meet
-    description: Build jitsi-meet images
+    description: Build jitsi-meet images.
     parent: system-config-build-image
     provides: jitsi-meet-container-image
     vars: &jitsi-meet_vars
@@ -944,8 +944,7 @@
 #  no roles currently run on them.
 - job:
     name: system-config-zuul-role-integration
-    description: |
-      Test roles provided by system-config with Zuul
+    description: Test roles provided by system-config with Zuul.
     abstract: true
     parent: base
     run: roles-test/base.yaml
@@ -1089,7 +1088,7 @@
     name: system-config-run-base-ansible-devel
     parent: system-config-run-base
     description: |
-      Run the base playbook with the latest ansible
+      Run the base playbook with the latest ansible.
     required-projects:
       - name: github.com/ansible/ansible
         override-checkout: devel
@@ -1558,7 +1557,7 @@
     name: system-config-run-zuul-preview
     parent: system-config-run
     description: |
-      Run the playbook for the docker registry.
+      Run the playbook for the zuul-preview service.
     nodeset:
       nodes:
         - name: bridge.openstack.org
@@ -1579,7 +1578,7 @@
     name: system-config-run-zuul
     parent: system-config-run
     description: |
-      Run the playbook for the docker registry.
+      Run the playbook for the main Zuul cluster.
     nodeset:
       nodes:
         - name: bridge.openstack.org
@@ -1673,7 +1672,7 @@
     name: system-config-run-static
     parent: system-config-run
     description: |
-      Run the playbook for a static node
+      Run the playbook for a static node.
     timeout: 3600
     nodeset:
       nodes:
@@ -2054,22 +2053,10 @@
     nodeset:
       nodes: []
 
-- job:
-    name: infra-prod-zuul_reconfigure
-    parent: infra-prod-playbook
-    description: |
-      Perform a full Zuul reconfiguration.
-
-      This reloads the tenant config file and clears all configuration
-      caches.
-    vars:
-      playbook_name: zuul_reconfigure.yaml
-
-
 - job:
     name: infra-prod-install-ansible
     parent: infra-prod-playbook
-    description: Install ansible on bridge
+    description: Install ansible on bridge.
     vars:
       playbook_name: install-ansible.yaml
     files:
@@ -2089,7 +2076,7 @@
 - job:
     name: infra-prod-base
     parent: infra-prod-playbook
-    description: Run the base playbook everywhere
+    description: Run the base playbook everywhere.
     dependencies:
       - name: infra-prod-install-ansible
         soft: true
@@ -2113,7 +2100,7 @@
 - job:
     name: infra-prod-service-letsencrypt
     parent: infra-prod-playbook
-    description: Run service-letsencrypt.yaml playbook
+    description: Run service-letsencrypt.yaml playbook.
     vars:
       playbook_name: service-letsencrypt.yaml
     dependencies:
@@ -2150,7 +2137,7 @@
 - job:
     name: infra-prod-service-base
     parent: infra-prod-playbook
-    description: Base job for most service playbooks
+    description: Base job for most service playbooks.
     abstract: true
     dependencies:
       - name: infra-prod-install-ansible
@@ -2163,7 +2150,7 @@
 - job:
     name: infra-prod-service-bridge
     parent: infra-prod-service-base
-    description: Run service-bridge.yaml playbook
+    description: Run service-bridge.yaml playbook.
     vars:
       playbook_name: service-bridge.yaml
     files:
@@ -2181,7 +2168,7 @@
 - job:
     name: infra-prod-service-gitea-lb
     parent: infra-prod-service-base
-    description: Run service-gitea-lb.yaml playbook
+    description: Run service-gitea-lb.yaml playbook.
     vars:
       playbook_name: service-gitea-lb.yaml
     files:
@@ -2195,7 +2182,7 @@
 - job:
     name: infra-prod-service-nameserver
     parent: infra-prod-service-base
-    description: Run service-nameserver.yaml playbook
+    description: Run service-nameserver.yaml playbook.
     vars:
       playbook_name: service-nameserver.yaml
     files:
@@ -2212,7 +2199,7 @@
 - job:
     name: infra-prod-service-nodepool
     parent: infra-prod-service-base
-    description: Run service-nodepool.yaml playbook
+    description: Run service-nodepool.yaml playbook.
     vars:
       playbook_name: service-nodepool.yaml
     required-projects:
@@ -2234,7 +2221,7 @@
 - job:
     name: infra-prod-service-etherpad
     parent: infra-prod-service-base
-    description: Run service-etherpad.yaml playbook
+    description: Run service-etherpad.yaml playbook.
     vars:
       playbook_name: service-etherpad.yaml
     files:
@@ -2250,7 +2237,7 @@
 - job:
     name: infra-prod-service-meetpad
     parent: infra-prod-service-base
-    description: Run service-meetpad.yaml playbook
+    description: Run service-meetpad.yaml playbook.
     dependencies:
       - name: infra-prod-install-ansible
         soft: true
@@ -2274,7 +2261,7 @@
 - job:
     name: infra-prod-service-mirror-update
     parent: infra-prod-service-base
-    description: Run service-mirror-update.yaml playbook
+    description: Run service-mirror-update.yaml playbook.
     vars:
       playbook_name: service-mirror-update.yaml
     files:
@@ -2288,7 +2275,7 @@
 - job:
     name: infra-prod-service-mirror
     parent: infra-prod-service-base
-    description: Run service-mirror.yaml playbook
+    description: Run service-mirror.yaml playbook.
     vars:
       playbook_name: service-mirror.yaml
     files:
@@ -2305,7 +2292,7 @@
 - job:
     name: infra-prod-service-static
     parent: infra-prod-service-base
-    description: Run service-static.yaml playbook
+    description: Run service-static.yaml playbook.
     vars:
       playbook_name: service-static.yaml
     files:
@@ -2321,7 +2308,7 @@
 - job:
     name: infra-prod-service-backup
     parent: infra-prod-service-base
-    description: Run service-backup.yaml playbook
+    description: Run service-backup.yaml playbook.
     vars:
       playbook_name: service-backup.yaml
     files:
@@ -2333,7 +2320,7 @@
 - job:
     name: infra-prod-service-registry
     parent: infra-prod-service-base
-    description: Run service-registry.yaml playbook
+    description: Run service-registry.yaml playbook.
     vars:
       playbook_name: service-registry.yaml
     files:
@@ -2347,7 +2334,7 @@
 - job:
     name: infra-prod-service-zuul-preview
     parent: infra-prod-service-base
-    description: Run service-zuul-preview.yaml playbook
+    description: Run service-zuul-preview.yaml playbook.
     vars:
       playbook_name: service-zuul-preview.yaml
     files:
@@ -2361,7 +2348,7 @@
 - job:
     name: infra-prod-service-zookeeper
     parent: infra-prod-service-base
-    description: Run service-zookeeper.yaml playbook
+    description: Run service-zookeeper.yaml playbook.
     vars:
       playbook_name: service-zookeeper.yaml
     files:
@@ -2375,7 +2362,12 @@
 - job:
     name: infra-prod-service-zuul
     parent: infra-prod-service-base
-    description: Run service-zuul.yaml playbook
+    description: |
+      Run service-zuul.yaml playbook.
+
+      This configures the main Zuul cluster.  It will perform a
+      smart-reconfigure of the scheduler if the tenant configuration
+      is changed.
     vars:
       playbook_name: service-zuul.yaml
     dependencies:
@@ -2402,7 +2394,7 @@
 - job:
     name: infra-prod-service-review
     parent: infra-prod-service-base
-    description: Run service-review.yaml playbook
+    description: Run service-review.yaml playbook.
     vars:
       playbook_name: service-review.yaml
     dependencies: &infra_prod_service_review_deps
@@ -2426,7 +2418,7 @@
 - job:
     name: infra-prod-service-review-dev
     parent: infra-prod-service-base
-    description: Run service-review-dev.yaml playbook
+    description: Run service-review-dev.yaml playbook.
     vars:
       playbook_name: service-review-dev.yaml
     dependencies: *infra_prod_service_review_deps
@@ -2442,7 +2434,7 @@
 - job:
     name: infra-prod-service-gitea
     parent: infra-prod-service-base
-    description: Run service-gitea.yaml playbook
+    description: Run service-gitea.yaml playbook.
     vars:
       playbook_name: service-gitea.yaml
     dependencies:
@@ -2473,7 +2465,7 @@
 - job:
     name: infra-prod-service-codesearch
     parent: infra-prod-service-base
-    description: Run service-codesearch.yaml playbook
+    description: Run service-codesearch.yaml playbook.
     required-projects:
       - opendev/system-config
       - openstack/project-config
@@ -2494,7 +2486,7 @@
 - job:
     name: infra-prod-service-eavesdrop
     parent: infra-prod-service-base
-    description: Run service-eavesdrop.yaml playbook
+    description: Run service-eavesdrop.yaml playbook.
     required-projects:
       - opendev/system-config
       - openstack/project-config
@@ -2528,7 +2520,7 @@
 - job:
     name: infra-prod-run-accessbot
     parent: infra-prod-service-base
-    description: Run run-accessbot.yaml playbook
+    description: Run run-accessbot.yaml playbook.
     required-projects:
       - opendev/system-config
       - openstack/project-config
@@ -2543,7 +2535,7 @@
 - job:
     name: infra-prod-remote-puppet-afs
     parent: infra-prod-service-base
-    description: Run remote-puppet-afs.yaml playbook
+    description: Run remote-puppet-afs.yaml playbook.
     vars:
       playbook_name: remote_puppet_afs.yaml
       infra_prod_ansible_forks: 1
@@ -2561,7 +2553,7 @@
 - job:
     name: infra-prod-remote-puppet-else
     parent: infra-prod-service-base
-    description: Run remote-puppet-else.yaml playbook
+    description: Run remote-puppet-else.yaml playbook.
     vars:
       playbook_name: remote_puppet_else.yaml
       infra_prod_ansible_forks: 50