diff --git a/hiera/common.yaml b/hiera/common.yaml
index 59b24c4666..bcdade0e08 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -55,6 +55,7 @@ cacti_hosts:
 - refstack01.openstack.org
 - review02.opendev.org
 - static01.opendev.org
+- static02.opendev.org
 - storyboard01.opendev.org
 - storyboard-dev01.opendev.org
 - translate.openstack.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 890fee61a4..6c42035c27 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -610,6 +610,17 @@ all:
         - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4E0alj0KOJAUMSbXVb8k3NfWvcWcPeoqRMap6ovM3tfp/Tjf5rtnx8XxutRcIxH6eUPyzODB1uMb552NvDWQQUvGoh8UeuUnhMPRxt+v5t0ZG1L/1HAqFmVLMzIOqBSuvbxFL4IrY9qqCWohQZb6Gh44bxyfH8i2F4XyE6v/UlowIGkq6K4tZDa/NUDf2KqFW0mystODODRO5UMp5he0WRLG0B0enIEAnvQW33WfuRt93lOHrkdU8wUJnLcejAsT6TKylH63eKMgVsc59gK8H3MsW9tIy8zWgh9fIdWnpLs057wgIDoAwfM33ZmUX9r3bxarvc/6EAxcbMl+9h+65'
         - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMu3PnnkNhPS2d5Z2uPju3Qqcbbc0lwHA1j9MgHlLnbK3bx1O2Kfez6RJUGl2i6nshdzkKwPBvN2vehQKiw1oSk='
         - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEKBoGg2o/j/HN6gttSeAF3jNLc8olr6PhLwG3r9aZl8'
+    static02.opendev.org:
+      ansible_host: 104.130.253.131
+      location:
+        cloud: openstackci-rax
+        region_name: DFW
+      public_v4: 104.130.253.131
+      public_v6: 2001:4800:7818:103:be76:4eff:fe01:f37d
+      host_keys:
+        - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL8zOJsEv2BGGZK2Exm8UmPY/p23wkE7HFqxIH0V31jol+1I4dzAEYKxvycwnD4m4rQXwGoRIyIrUT8JT+qmP6s='
+        - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0cPyED5mIs3gBCtzLzgonwTcboN35/48lLaFDqgFFm3Wu8i407nLz97KbgJsUHMB8QzkgjER2wajVHDc8TdrsCv83wMdYPO5SzhllPE3MtVa4RD7hSTY3RLqrLYtPf0vqCTGd12/+HKpN8j/ZrRbfzY6j9pxYRPTdL7HYyO+HsOqgQyPAN7GZ1+w0s7/ZMSd5hSYaQ19JcopKHllIgwlOiQrJgo5rVGdntog/d1QIT108YmsyfUWZQFaDyyJEcm5Ki9ot1YthDbmcOIVNpbgGhokI/4H3vRCtWNGI+QhiyLiURCb+CFS+cJ467P/4PvkqcJVcw/Hp7SyW3WDz+6qraem3DK+QvfWW0hff+A3slDhFiHUvGjKZs8ypvB50cxMC+8IUI3JPyylSWtjAyc05EcdehhwQZOqEepejDAHAAMsE6o7AfnYX4jjpuOD3MHAom6aZY338mo4KsmrRp2plSSfxG8diZrdq9GB3SqQN1lixPVFHc7ZG+Ul4TDaGCg0='
+        - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIClV2rh/76OiC9wHltYgrjEBgIDJt46gpZqtpYTyx5La'
     storyboard-dev01.opendev.org:
       ansible_host: 23.253.234.105
       location:
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 5f6467a649..4a8242097a 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -1150,7 +1150,7 @@
       nodes:
         - <<: *bridge_node_x86
         - name: static99.opendev.org
-          label: ubuntu-bionic
+          label: ubuntu-jammy
       groups:
         - <<: *bastion_group
     vars: