diff --git a/hiera/common.yaml b/hiera/common.yaml
index 13f094589a..6b845e7053 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -306,10 +306,10 @@ cacti_hosts:
 - ze02.opendev.org
 - ze03.opendev.org
 - ze04.opendev.org
-- ze05.openstack.org
-- ze06.openstack.org
-- ze07.openstack.org
-- ze08.openstack.org
+- ze05.opendev.org
+- ze06.opendev.org
+- ze07.opendev.org
+- ze08.opendev.org
 - ze09.openstack.org
 - ze10.openstack.org
 - ze11.openstack.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index d22aa905dd..9579a55a34 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -775,34 +775,34 @@ all:
         region_name: DFW
       public_v4: 104.130.140.221
       public_v6: 2001:4800:7818:101:be76:4eff:fe04:4910
-    ze05.openstack.org:
-      ansible_host: 104.130.139.51
+    ze05.opendev.org:
+      ansible_host: 104.130.135.43
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.130.139.51
-      public_v6: 2001:4800:7818:103:be76:4eff:fe04:5ed2
-    ze06.openstack.org:
-      ansible_host: 104.130.127.102
+      public_v4: 104.130.135.43
+      public_v6: 2001:4800:7818:101:be76:4eff:fe04:4335
+    ze06.opendev.org:
+      ansible_host: 104.239.136.107
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.130.127.102
-      public_v6: 2001:4800:7818:104:be76:4eff:fe04:8f1a
-    ze07.openstack.org:
-      ansible_host: 104.239.136.85
+      public_v4: 104.239.136.107
+      public_v6: 2001:4800:7818:104:be76:4eff:fe04:4565
+    ze07.opendev.org:
+      ansible_host: 104.239.144.76
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.239.136.85
-      public_v6: 2001:4800:7818:104:be76:4eff:fe04:bfcd
-    ze08.openstack.org:
-      ansible_host: 104.239.143.247
+      public_v4: 104.239.144.76
+      public_v6: 2001:4800:7818:104:be76:4eff:fe04:47b5
+    ze08.opendev.org:
+      ansible_host: 104.239.144.97
       location:
         cloud: openstackci-rax
         region_name: DFW
-      public_v4: 104.239.143.247
-      public_v6: 2001:4800:7818:104:be76:4eff:fe04:6612
+      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
       location: