diff --git a/tox.ini b/tox.ini
index ecf682940e..8819465b20 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,7 +39,7 @@ commands = sphinx-build -W -E -b html doc/source doc/build/html
 deps =
   pytest-html # MPL-2.0
   pytest-testinfra[ansible]>=6.0.0
-  selenium
+  selenium==3.141.0
   requests
 
 # This environment assumes a gate-hosts.yaml file has been written.
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 0612ecebea..faec03b111 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -59,8 +59,7 @@
       currently in use.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - &bridge_node_x86 { name: bridge.openstack.org, label: ubuntu-jammy }
         - name: xenial
           label: ubuntu-xenial
         - name: bionic
@@ -82,8 +81,7 @@
       Run the base playbook with the latest ansible.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-focal
+        - <<: *bridge_node_x86
         - name: xenial
           label: ubuntu-xenial
         - name: bionic
@@ -124,8 +122,7 @@
       Run the "base" playbook on ARM64.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic-arm64
+        - &bridge_node_arm64 { name: bridge.openstack.org, label: ubuntu-jammy-arm64 }
         - name: bionic
           label: ubuntu-bionic-arm64
         - name: focal
@@ -154,8 +151,7 @@
       - ptgbot-container-image
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: eavesdrop01.opendev.org
           label: ubuntu-focal
     vars:
@@ -196,8 +192,7 @@
       Run the playbook for letsencrypt key acquisition
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: adns-letsencrypt.opendev.org
           label: ubuntu-bionic
         - name: letsencrypt01.opendev.org
@@ -244,8 +239,7 @@
     post-run: playbooks/zuul/run-lists-post.yaml
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: lists.openstack.org
           label: ubuntu-focal
         - name: lists.katacontainers.io
@@ -293,8 +287,7 @@
       Run the playbook for nodepool.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: zk04.opendev.org
           label: ubuntu-focal
         - name: nl01.opendev.org
@@ -341,8 +334,7 @@
       - opendev/zone-zuul-ci.org
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: adns1.opendev.org
           label: ubuntu-bionic
         - name: ns1.opendev.org
@@ -374,8 +366,7 @@
       Run the playbook for borg backup configuration
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: borg-backup01.region.provider.opendev.org
           label: ubuntu-focal
         - name: borg-backup-focal.opendev.org
@@ -450,8 +441,7 @@
     parent: system-config-run-mirror-base
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: mirror01.openafs.provider.opendev.org
           label: ubuntu-bionic
         - name: mirror02.openafs.provider.opendev.org
@@ -462,8 +452,7 @@
     parent: system-config-run-mirror-base
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic-arm64
+        - <<: *bridge_node_arm64
         - name: mirror01.openafs.provider.opendev.org
           label: ubuntu-focal-arm64
 
@@ -474,8 +463,7 @@
       Run the playbook for a mirror update node
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: mirror-update99.opendev.org
           label: ubuntu-focal
     vars:
@@ -498,8 +486,7 @@
       Run the playbook for the docker registry.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: insecure-ci-registry01.opendev.org
           label: ubuntu-bionic
     vars:
@@ -532,8 +519,7 @@
       - opendev/system-config
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: codesearch01.opendev.org
           label: ubuntu-focal
     vars:
@@ -560,8 +546,7 @@
     requires: etherpad-container-image
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: etherpad01.opendev.org
           label: ubuntu-bionic
     vars:
@@ -586,7 +571,7 @@
     timeout: 4800
     nodeset:
       nodes:
-        - name: bridge.openstack.org
+        - <<: *bridge_node_x86
           label: ubuntu-bionic
         - name: gitea-lb02.opendev.org
           label: ubuntu-jammy
@@ -664,8 +649,7 @@
       - openstack/project-config
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: grafana01.opendev.org
           label: ubuntu-focal
     vars:
@@ -692,8 +676,7 @@
       - opendev/system-config
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: graphite02.opendev.org
           label: ubuntu-focal
     vars:
@@ -721,8 +704,7 @@
       Run the playbook for the keycloak servers.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: keycloak01.opendev.org
           label: ubuntu-focal
     vars:
@@ -747,8 +729,7 @@
       Run the playbook for jitsi-meet.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: meetpad01.opendev.org
           label: ubuntu-bionic
         - name: jvb01.opendev.org
@@ -786,8 +767,7 @@
       - lodgeit-container-image
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: paste99.opendev.org
           label: ubuntu-focal
     vars:
@@ -813,8 +793,7 @@
       Run the playbook for the jaeger servers.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: tracing99.opendev.org
           label: ubuntu-focal
     vars:
@@ -838,8 +817,7 @@
       Run the playbook for the zookeeper cluster.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: zk04.opendev.org
           label: ubuntu-focal
     vars:
@@ -864,8 +842,7 @@
       Run the playbook for the zuul-preview service.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: zp01.opendev.org
           label: ubuntu-bionic
     vars:
@@ -885,8 +862,7 @@
       Run the playbook for the main Zuul cluster.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: zk04.opendev.org
           label: ubuntu-focal
         - name: zm01.opendev.org
@@ -962,8 +938,7 @@
       Base job for testing gerrit
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: review99.opendev.org
           label: ubuntu-focal
     required-projects:
@@ -1042,8 +1017,7 @@
       Run the playbook for a static node.
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: static99.opendev.org
           label: ubuntu-bionic
     vars:
@@ -1073,8 +1047,7 @@
       - refstack-container-image
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: refstack01.openstack.org
           label: ubuntu-focal
     host-vars:
@@ -1105,8 +1078,7 @@
       Run the playbook for kerberos servers
     nodeset:
       nodes:
-        - name: bridge.openstack.org
-          label: ubuntu-bionic
+        - <<: *bridge_node_x86
         - name: kdc-primary.opendev.org
           label: ubuntu-focal
         - name: kdc-replica.opendev.org