diff --git a/hiera/common.yaml b/hiera/common.yaml
index 77bc67eb3d..4261c4ee0e 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -29,7 +29,7 @@ cacti_hosts:
 - kdc03.openstack.org
 - kdc04.openstack.org
 - keycloak01.opendev.org
-- keycloak02.opendev.org
+- keycloak03.opendev.org
 - lists01.opendev.org
 - nb01.opendev.org
 - nb02.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 816a18267d..6cedea15cf 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -286,17 +286,17 @@ all:
         - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDSSMogKR8EYhOMFBppOG80myHPQbxHF2aFixd9lOBk2i7indZVvQWdrcF5ITFsw872U75CKjIyQRQMP1AEGgBoPdIi6W5+cPczt8akJMm2vZPY8hoqpvuhrs5rOFT2QsGxWszeY2ELcbltNHdKPD9Kj2o8/CPkMEutfijKgVgeAmZua2qDge6OT/hPeQuw8OmuURfDmFbJ8TFuRWhAZl8NSGd3nLNEymT182Jo9oxN1EbUKMbff+3FrxQP3l1FKb00k15yKF6hxrFO7D9m0ERLMC6JUv7L1I4dAKOTuIfspvTOkbAw9EDwB+RQ54BJPT+DQunM0DEom7+s9vzPumT6s9ksy7qC6OPaZTnY3PM/c611UmVxZolQoYR/TiXXoO9m5eNDBn8Dzhc7F7X5cwr7Mz28dGibU13FcO+MhVSbdV9zf+Dsf3YX7m2NFxoueqeyAaZQFRwmfHfvCXYtIMU+61UCCyi3oQrVWMpR9EHYHgbbyYebC+qXvmEoA4VkVbM='
         - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOiAXQcp+xd+Sr0Tad+Hs7xcYuhfQZlpOsL29zZXRORciV/OD/YMqc1I0+XbFPGhuCEHzBX0dd0auvH5xsRjJK4='
         - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIy2CnCtaLaJgVuC7gya00bbgZxlpJTHtqSvH94ZH987'
-    keycloak02.opendev.org:
-      ansible_host: 166.78.156.180
+    keycloak03.opendev.org:
+      ansible_host: 104.239.142.197
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 166.78.156.180
-      public_v6: 2001:4800:7812:514:be76:4eff:fe04:3550
+      public_v4: 104.239.142.197
+      public_v6: 2001:4800:7818:104:be76:4eff:fe03:e565
       host_keys:
-        - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5aaqmvYYnczr0fFgQAhgIodY3RuDkbLp+SRiwmmN0v
-        - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDEnQA9HlWJS934+oAHAOrhWRdWH9u50NFEIbiC82qznUT2Nc8KrGE9WNFH/AboPBcXINZ20PLvkdJxI878xirx6PpvFAIEmEJcukopb6b5I+wQMdahByAAGzCmp5sjp6Uziv3qbr7ePUMKLpg7/M0XK6IqtFsVWI7QNjLIo6PH6eHf3HWRkWjYn4nR6Ru2HHW9J3EFoaBYTEXD7oBgx16n06Vx+I+zMV4q9+80rxPQKkRZfDC23oxediVES0JiHnFN8z7NxbWocmHw6FR3qVqmw4FZuUPNlVTT+OJDVZMGUkf/k7YQ1KtoZDABxd5UuYztabZftMuvbLv0gIYe/i9NOzAaMQLRwdec/SO/mkEv7A5MHzpzuVBrvrAQcwxGcwe/Wx2WZFKBRuyYLbLD1u/rvMiotKylhVsoy/GKM7stffC/n/5S6EW+nEYfydFmgk8HuFwUm36ju813T2m5W2//swlhY2qSEjW+I9O8j+NR1Vk2o449+shobxg5Z7MBW+8=
-        - ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCDhfZ5zNPQ5Iab0EWFyLQF4O61LcAhAhCr8ezG3MxlbNGy5NSNmqpGjHKRhBHvI5yYQcigQKR7XSfRxWd3KCGw=
+        - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDCo1UGz7qE+/bOMvWFbxTLVZuq2Cweve/yHTqsvKlXRIUMPRpAHA0b4twa3/8i3YIXFgtATk9m4lLsa9jBhBe5CyWsE1Ok+j4ty6DhaZxu8UUyB86HT2slZpihOikH33Lbc0bvChvhbvlHCin2i2RabuI7QljckR6634Mimq/pU+Zqo+lKLaQesn3mY2bD8uy/MroZGHofd7T0YshtcCK36Ed295TnlzHdqtuFHRCN54C2x6pr3zkQ3RU+Wg0CDBZf6bTVMfZ07Q3EvNBH8LnwFfmsURHCA8GcmfGLhTeoJevuNre9hJdbQiWT0IVnKMmFLY3qUXg+Gb4mC9JUMF3LG3JEdSTzNxei7UUkQc3S6fGV8YvP0dAbfowIxJcRUl7uXHvnwWiCXP7Wc8qRuzqRyT7MQzt31ta1p/3KQoPkdJPcP0Hy4dNwOLWGZS9cUf6rvfXJEbBlnxoo3cBGjWR7sOSOIMPUXL5dlkRwacg+eyDC5GQ1kpsceSqa4CyvIWE=
+        - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJCdgu9D5EtKSXOyCGCzZsCUxn8cvq6obzZBKUL/Fd1h
+        - ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG15sfxaS7DGu5NN9R/EgDUl/uEG1EJf4bI2AsuzdHIT7UayhbwRQXfaRAkmD6Is+1Kc1AYdLYH7GRqYVE5VtKc=
     kdc03.openstack.org:
       ansible_host: 23.253.107.82
       location: