diff --git a/hiera/common.yaml b/hiera/common.yaml
index 6b845e7053..2bddb47501 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -310,10 +310,10 @@ cacti_hosts:
 - ze06.opendev.org
 - ze07.opendev.org
 - ze08.opendev.org
-- ze09.openstack.org
-- ze10.openstack.org
-- ze11.openstack.org
-- ze12.openstack.org
+- ze09.opendev.org
+- ze10.opendev.org
+- ze11.opendev.org
+- ze12.opendev.org
 - zk01.openstack.org
 - zk02.openstack.org
 - zk03.openstack.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 9579a55a34..7a6c4197e8 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -803,34 +803,34 @@ all:
         region_name: DFW
       public_v4: 104.239.144.97
       public_v6: 2001:4800:7818:104:be76:4eff:fe04:4816
-    ze09.openstack.org:
-      ansible_host: 104.239.136.207
+    ze09.opendev.org:
+      ansible_host: 104.239.142.119
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.239.136.207
-      public_v6: 2001:4800:7818:104:be76:4eff:fe02:6612
-    ze10.openstack.org:
-      ansible_host: 104.239.135.53
+      public_v4: 104.239.142.119
+      public_v6: 2001:4800:7818:104:be76:4eff:fe01:2b8
+    ze10.opendev.org:
+      ansible_host: 104.130.135.197
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.239.135.53
-      public_v6: 2001:4800:7819:104:be76:4eff:fe04:41e5
-    ze11.openstack.org:
-      ansible_host: 104.239.149.58
+      public_v4: 104.130.135.197
+      public_v6: 2001:4800:7818:101:be76:4eff:fe04:5364
+    ze11.opendev.org:
+      ansible_host: 104.130.135.134
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.239.149.58
-      public_v6: 2001:4800:7819:105:be76:4eff:fe04:4f0d
-    ze12.openstack.org:
-      ansible_host: 104.130.124.187
+      public_v4: 104.130.135.134
+      public_v6: 2001:4800:7818:101:be76:4eff:fe04:4e5e
+    ze12.opendev.org:
+      ansible_host: 104.130.126.61
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.130.124.187
-      public_v6: 2001:4800:7818:104:be76:4eff:fe03:b582
+      public_v4: 104.130.126.61
+      public_v6: 2001:4800:7818:104:be76:4eff:fe04:5fdf
     zk01.openstack.org:
       ansible_host: 23.253.236.126
       location:
diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
index 7dc63e478f..36c82edeb9 100644
--- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
+++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
@@ -51,10 +51,5 @@ results:
     - zuul
     - zuul-executor
 
-  ze12.openstack.org:
-    - afs-client
-    - zuul
-    - zuul-executor
-
   zk01.openstack.org:
     - zookeeper
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 6cd2af0950..7a2b2dd64a 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -741,8 +741,6 @@
           label: ubuntu-focal
         - name: ze01.opendev.org
           label: ubuntu-focal
-        - name: ze12.openstack.org
-          label: ubuntu-xenial
         - name: zuul01.openstack.org
           label: ubuntu-xenial
     required-projects:
@@ -766,11 +764,6 @@
           '/etc/hosts': logs
           '/etc/zuul/zuul.conf': logs
           '/var/log/zuul/executor-debug.log': logs
-      ze12.openstack.org:
-        host_copy_output:
-          '/etc/hosts': logs
-          '/etc/zuul/zuul.conf': logs
-          '/var/log/zuul/executor-debug.log': logs
       zuul01.openstack.org:
         host_copy_output:
           '/etc/hosts': logs