diff --git a/hiera/common.yaml b/hiera/common.yaml
index bcdade0e08..d3a9546581 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -15,6 +15,7 @@ cacti_hosts:
 - cacti.openstack.org
 - eavesdrop01.opendev.org
 - etherpad01.opendev.org
+- etherpad02.opendev.org
 - gitea-lb02.opendev.org
 - gitea09.opendev.org
 - gitea10.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 6c42035c27..33ff3a7b38 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -154,6 +154,17 @@ all:
         - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCz44sPF81S5rnDnxcHh3d4B+iKneNEfUVekTw605lQLNDxNeaugFoRCBE3WYtNpO4y1m8gei8Wd3/0DHPLlsvbvPbugyKVp9HYEC0gCMWe5vc8I/KFhKs3IF+cly/apIvHliZY9lCN2TsLrBtHTPlB0voK9JrA9zij+h9MGMXkPWYKPaapMqoB2GdLgIfYPn1nENe77lL0BM6E4DFl/VzHRl/DXNiqb8pe5LlQTt/u7PQp4ykz43UqVgRc/Db0d8PisBeedXH0dgNhvGFlB0N741qe0D7xK5DXLNKlqqUpf1ougm+QN/6wr2mRD+2inKrTHcw/jKT5SeoYIjzQgIVB'
         - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFf4DAtYplEfCNzT+7VcQgwjtHAEDok5DqCIgPsaQuWUqeWjSvQM8GpRyLntnjcyA1RsbDxjIDdH1u11mz7KldI='
         - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBipMUkU7TY3Lw+eX+4BjmBG1Kvwv/fr2c/9KkeBfY4i'
+    etherpad02.opendev.org:
+      ansible_host: 104.239.145.42
+      location:
+        cloud: openstackci-rax
+        region_name: DFW
+      public_v4: 104.239.145.42
+      public_v6: 2001:4800:7818:104:be76:4eff:fe03:add6
+      host_keys:
+        - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJrvSBsPBSl/5ksiCF+6Z3ALCQaw6t4HFgROcfzqZ3+X'
+        - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDIhyTPc++Ee7Hr8tcaxNnfsLF9PgRFzL6e2oWcYYDrv5a1ZfwMDvOfELpVgOQfIiePUzLYvXd7NyQI6rEQmFNLVdA9TuN7IiCWruFF9DTSENzDyjsp4nG+LH3uw1pjljkOvrN1fQ3WHoyxbZB3eIZkQsF99BjguPj0lpUqy0GYQU+qjk1TgFkXc3iIiXgNTXsn1ac6UgGDGvOxv1PAcIJmgmWT10wSYGlbhorpa0RT43YPIyxak3VxAyCTKSs7KPKO67ni/5/pI/KQ3iDI5f94wWe/JoNTH5Y5pzu2gp1TD+noziApNODJQ57MgJ+c/hjNuVX+WqyhxxW5Mj3mECZbPqcGRKgGLpwsKJd8Jiot3Szf2/1faGaiftM3JvFtz2u+ma8/aAVBgvHVsvvOYdCwGptpOxLpFLHMJSnewAiCFAtq0/sLNpunQLCKDUcGC/9B3+ei+pwjIpKZ7+MfAOgp4VROI/nii4vT+g/nWdW98vvH/jTc93V9NJt6Nt7/nF8='
+        - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLdlo1t2GMp4z9dGbdojsGkxmahg6kkFhBeT+rfdgdndroR+/GGds7ziV8YkZ18Qrx6nC2xOt5llsgLSFex6Mqk='
     gitea-lb02.opendev.org:
       ansible_host: 38.108.68.66
       location:
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 0c4cc4e01a..3aba631009 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -652,7 +652,7 @@
       nodes:
         - <<: *bridge_node_x86
         - name: etherpad99.opendev.org
-          label: ubuntu-bionic
+          label: ubuntu-jammy
       groups:
         - <<: *bastion_group
     vars: