diff --git a/inventory/builders b/inventory/builders
index 81b6c06468..c9bbb1b084 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -146,14 +146,6 @@ bvmhost-a64-02.iad2.fedoraproject.org
 bvmhost-a64-03.iad2.fedoraproject.org
 bvmhost-a64-04.iad2.fedoraproject.org
 # These are lenovo emags in IAD2
-bvmhost-a64-05.iad2.fedoraproject.org
-bvmhost-a64-06.iad2.fedoraproject.org
-bvmhost-a64-07.iad2.fedoraproject.org
-bvmhost-a64-08.iad2.fedoraproject.org
-bvmhost-a64-09.iad2.fedoraproject.org
-bvmhost-a64-10.iad2.fedoraproject.org
-bvmhost-a64-11.iad2.fedoraproject.org
-# These are lenovo emags in IAD2
 bvmhost-a64-01.stg.iad2.fedoraproject.org
 # ppc
 bvmhost-p09-01.iad2.fedoraproject.org
@@ -164,14 +156,26 @@ bvmhost-p09-05.iad2.fedoraproject.org
 bvmhost-p09-01.stg.iad2.fedoraproject.org
 
 [buildhw]
+# emags
 buildhw-a64-01.iad2.fedoraproject.org
 buildhw-a64-02.iad2.fedoraproject.org
+# mt snow
 buildhw-a64-03.iad2.fedoraproject.org
 buildhw-a64-04.iad2.fedoraproject.org
 buildhw-a64-05.iad2.fedoraproject.org
 buildhw-a64-06.iad2.fedoraproject.org
+# emags
+buildhw-a64-07.iad2.fedoraproject.org
+buildhw-a64-08.iad2.fedoraproject.org
+buildhw-a64-09.iad2.fedoraproject.org
+buildhw-a64-10.iad2.fedoraproject.org
+buildhw-a64-11.iad2.fedoraproject.org
+buildhw-a64-12.iad2.fedoraproject.org
+buildhw-a64-13.iad2.fedoraproject.org
+# caviums
 buildhw-a64-19.iad2.fedoraproject.org
 buildhw-a64-20.iad2.fedoraproject.org
+# emags
 buildhw-a64-21.iad2.fedoraproject.org
 buildhw-a64-22.iad2.fedoraproject.org
 buildhw-a64-23.iad2.fedoraproject.org
diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index dcf48e52a6..67e8d6a936 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -65,13 +65,13 @@ iad2_management_hosts:
   - bvmhost-a64-02.mgmt.iad2.fedoraproject.org.
   - bvmhost-a64-03.mgmt.iad2.fedoraproject.org.
   - bvmhost-a64-04.mgmt.iad2.fedoraproject.org.
-  - bvmhost-a64-05.mgmt.iad2.fedoraproject.org.
-  - bvmhost-a64-06.mgmt.iad2.fedoraproject.org.
-  - bvmhost-a64-07.mgmt.iad2.fedoraproject.org.
-  - bvmhost-a64-08.mgmt.iad2.fedoraproject.org.
-  - bvmhost-a64-09.mgmt.iad2.fedoraproject.org.
-  - bvmhost-a64-10.mgmt.iad2.fedoraproject.org.
-  - bvmhost-a64-11.mgmt.iad2.fedoraproject.org.
+  - buildhw-a64-07.mgmt.iad2.fedoraproject.org.
+  - buildhw-a64-08.mgmt.iad2.fedoraproject.org.
+  - buildhw-a64-09.mgmt.iad2.fedoraproject.org.
+  - buildhw-a64-10.mgmt.iad2.fedoraproject.org.
+  - buildhw-a64-11.mgmt.iad2.fedoraproject.org.
+  - buildhw-a64-12.mgmt.iad2.fedoraproject.org.
+  - buildhw-a64-13.mgmt.iad2.fedoraproject.org.
   - bvmhost-p09-01.mgmt.iad2.fedoraproject.org.
   - bvmhost-p09-02.mgmt.iad2.fedoraproject.org.
   - bvmhost-p09-03.mgmt.iad2.fedoraproject.org.
diff --git a/inventory/hardware b/inventory/hardware
index 8d1dd6c193..5a772f8606 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -106,12 +106,13 @@ buildhw-a64-22.iad2.fedoraproject.org
 buildhw-a64-23.iad2.fedoraproject.org
 buildhw-a64-24.iad2.fedoraproject.org
 bvmhost-a64-01.stg.iad2.fedoraproject.org
-bvmhost-a64-05.iad2.fedoraproject.org
-bvmhost-a64-06.iad2.fedoraproject.org
-bvmhost-a64-07.iad2.fedoraproject.org
-bvmhost-a64-08.iad2.fedoraproject.org
-bvmhost-a64-09.iad2.fedoraproject.org
-bvmhost-a64-11.iad2.fedoraproject.org
+buildhw-a64-07.iad2.fedoraproject.org
+buildhw-a64-08.iad2.fedoraproject.org
+buildhw-a64-09.iad2.fedoraproject.org
+buildhw-a64-10.iad2.fedoraproject.org
+buildhw-a64-11.iad2.fedoraproject.org
+buildhw-a64-12.iad2.fedoraproject.org
+buildhw-a64-13.iad2.fedoraproject.org
 openqa-a64-worker01.iad2.fedoraproject.org
 openqa-a64-worker02.iad2.fedoraproject.org
 openqa-a64-worker03.iad2.fedoraproject.org
@@ -120,11 +121,19 @@ openqa-a64-worker03.iad2.fedoraproject.org
 storinator01.rdu-cc.fedoraproject.org
 
 [aarch64]
-bvmhost-a64-05.iad2.fedoraproject.org
-bvmhost-a64-06.iad2.fedoraproject.org
-bvmhost-a64-07.iad2.fedoraproject.org
 buildhw-a64-01.iad2.fedoraproject.org
 buildhw-a64-02.iad2.fedoraproject.org
+buildhw-a64-03.iad2.fedoraproject.org
+buildhw-a64-04.iad2.fedoraproject.org
+buildhw-a64-05.iad2.fedoraproject.org
+buildhw-a64-06.iad2.fedoraproject.org
+buildhw-a64-07.iad2.fedoraproject.org
+buildhw-a64-08.iad2.fedoraproject.org
+buildhw-a64-09.iad2.fedoraproject.org
+buildhw-a64-10.iad2.fedoraproject.org
+buildhw-a64-11.iad2.fedoraproject.org
+buildhw-a64-12.iad2.fedoraproject.org
+buildhw-a64-13.iad2.fedoraproject.org
 buildhw-a64-19.iad2.fedoraproject.org
 buildhw-a64-20.iad2.fedoraproject.org
 buildhw-a64-21.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildhw-a64-07.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-07.iad2.fedoraproject.org
new file mode 100644
index 0000000000..510a9d7a1e
--- /dev/null
+++ b/inventory/host_vars/buildhw-a64-07.iad2.fedoraproject.org
@@ -0,0 +1,29 @@
+---
+datacenter: iad2
+eth1_ip: 10.3.170.127
+eth1_ipv4_gw: 10.3.170.254
+gw: 10.3.170.254
+network_connections:
+  - autoconnect: no
+    mac: 00:1b:21:dc:b1:d8
+    name: eth0
+    type: ethernet
+  - autoconnect: yes
+    ip:
+      address: 10.3.170.121/24
+      dhcp4: no
+      dns:
+        - 10.3.163.33
+        - 10.3.163.34
+      dns_search:
+        - iad2.fedoraproject.org
+        - fedoraproject.org
+      gateway4: 10.3.170.254
+    mac: 50:6b:4b:6a:ef:70
+    name: eth1
+    state: up
+    type: ethernet
+  - autoconnect: no
+    mac: 50:6b:4b:6a:ef:71
+    name: eth2
+    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-08.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-08.iad2.fedoraproject.org
new file mode 100644
index 0000000000..c71349011a
--- /dev/null
+++ b/inventory/host_vars/buildhw-a64-08.iad2.fedoraproject.org
@@ -0,0 +1,29 @@
+---
+datacenter: iad2
+eth1_ip: 10.3.170.128
+eth1_ipv4_gw: 10.3.170.254
+gw: 10.3.170.254
+network_connections:
+  - autoconnect: no
+    mac: 68:05:ca:8e:ab:b6
+    name: eth0
+    type: ethernet
+  - autoconnect: yes
+    ip:
+      address: 10.3.170.121/24
+      dhcp4: no
+      dns:
+        - 10.3.163.33
+        - 10.3.163.34
+      dns_search:
+        - iad2.fedoraproject.org
+        - fedoraproject.org
+      gateway4: 10.3.170.254
+    mac: 50:6b:4b:6a:ba:60
+    name: eth1
+    state: up
+    type: ethernet
+  - autoconnect: no
+    mac: 50:6b:4b:6a:ba:61
+    name: eth2
+    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-09.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-09.iad2.fedoraproject.org
new file mode 100644
index 0000000000..6dff3c3ae8
--- /dev/null
+++ b/inventory/host_vars/buildhw-a64-09.iad2.fedoraproject.org
@@ -0,0 +1,29 @@
+---
+datacenter: iad2
+eth1_ip: 10.3.170.129
+eth1_ipv4_gw: 10.3.170.254
+gw: 10.3.170.254
+network_connections:
+  - autoconnect: no
+    mac: 68:05:ca:92:ca:5e
+    name: eth0
+    type: ethernet
+  - autoconnect: yes
+    ip:
+      address: 10.3.170.121/24
+      dhcp4: no
+      dns:
+        - 10.3.163.33
+        - 10.3.163.34
+      dns_search:
+        - iad2.fedoraproject.org
+        - fedoraproject.org
+      gateway4: 10.3.170.254
+    mac: 50:6b:4b:6b:07:00
+    name: eth1
+    state: up
+    type: ethernet
+  - autoconnect: no
+    mac: 50:6b:4b:6b:07:01
+    name: eth2
+    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-10.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-10.iad2.fedoraproject.org
new file mode 100644
index 0000000000..f74afa7b98
--- /dev/null
+++ b/inventory/host_vars/buildhw-a64-10.iad2.fedoraproject.org
@@ -0,0 +1,29 @@
+---
+datacenter: iad2
+eth1_ip: 10.3.170.130
+eth1_ipv4_gw: 10.3.170.254
+gw: 10.3.170.254
+network_connections:
+  - autoconnect: no
+    mac: 68:05:ca:8a:f4:dc
+    name: eth0
+    type: ethernet
+  - autoconnect: yes
+    ip:
+      address: 10.3.170.121/24
+      dhcp4: no
+      dns:
+        - 10.3.163.33
+        - 10.3.163.34
+      dns_search:
+        - iad2.fedoraproject.org
+        - fedoraproject.org
+      gateway4: 10.3.170.254
+    mac: 50:6b:4b:6a:c2:00
+    name: eth1
+    state: up
+    type: ethernet
+  - autoconnect: no
+    mac: 50:6b:4b:6a:c2:01
+    name: eth2
+    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org
new file mode 100644
index 0000000000..34c67098be
--- /dev/null
+++ b/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org
@@ -0,0 +1,29 @@
+---
+datacenter: iad2
+eth1_ip: 10.3.170.131
+eth1_ipv4_gw: 10.3.170.254
+gw: 10.3.170.254
+network_connections:
+  - autoconnect: no
+    mac: 68:05:ca:8b:03:e7
+    name: eth0
+    type: ethernet
+  - autoconnect: yes
+    ip:
+      address: 10.3.170.121/24
+      dhcp4: no
+      dns:
+        - 10.3.163.33
+        - 10.3.163.34
+      dns_search:
+        - iad2.fedoraproject.org
+        - fedoraproject.org
+      gateway4: 10.3.170.254
+    mac: 50:6b:4b:6a:c9:70
+    name: eth1
+    state: up
+    type: ethernet
+  - autoconnect: no
+    mac: 50:6b:4b:6a:c9:71
+    name: eth2
+    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-12.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-12.iad2.fedoraproject.org
new file mode 100644
index 0000000000..0ee532eca6
--- /dev/null
+++ b/inventory/host_vars/buildhw-a64-12.iad2.fedoraproject.org
@@ -0,0 +1,29 @@
+---
+datacenter: iad2
+eth1_ip: 10.3.170.132
+eth1_ipv4_gw: 10.3.170.254
+gw: 10.3.170.254
+network_connections:
+  - autoconnect: no
+    mac: 68:05:ca:8e:97:ab
+    name: eth0
+    type: ethernet
+  - autoconnect: yes
+    ip:
+      address: 10.3.170.121/24
+      dhcp4: no
+      dns:
+        - 10.3.163.33
+        - 10.3.163.34
+      dns_search:
+        - iad2.fedoraproject.org
+        - fedoraproject.org
+      gateway4: 10.3.170.254
+    mac: 50:6b:4b:6a:dd:a0
+    name: eth1
+    state: up
+    type: ethernet
+  - autoconnect: no
+    mac: 50:6b:4b:6a:dd:a1
+    name: eth2
+    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-13.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-13.iad2.fedoraproject.org
new file mode 100644
index 0000000000..bbfafa5e3b
--- /dev/null
+++ b/inventory/host_vars/buildhw-a64-13.iad2.fedoraproject.org
@@ -0,0 +1,29 @@
+---
+datacenter: iad2
+eth1_ip: 10.3.170.133
+eth1_ipv4_gw: 10.3.170.254
+gw: 10.3.170.254
+network_connections:
+  - autoconnect: no
+    mac: 68:05:ca:8e:aa:33
+    name: eth0
+    type: ethernet
+  - autoconnect: yes
+    ip:
+      address: 10.3.170.121/24
+      dhcp4: no
+      dns:
+        - 10.3.163.33
+        - 10.3.163.34
+      dns_search:
+        - iad2.fedoraproject.org
+        - fedoraproject.org
+      gateway4: 10.3.170.254
+    mac: 50:6b:4b:6a:c2:50
+    name: eth1
+    state: up
+    type: ethernet
+  - autoconnect: no
+    mac: 50:6b:4b:6a:c2:51
+    name: eth2
+    type: ethernet
diff --git a/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org
deleted file mode 100644
index 7817c445f2..0000000000
--- a/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org
+++ /dev/null
@@ -1,36 +0,0 @@
----
-br0_ipv4: 10.3.170.15
-br0_ipv4_gw: 10.3.170.254
-br0_ipv4_nm: 24
-br0_port0_mac: "{{ mac1 }}"
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-has_ipv4: yes
-mac1: 50:6b:4b:6a:ef:70
-nbde: false
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-      gateway4: "{{ br0_ipv4_gw }}"
-    name: br0
-    state: up
-    type: bridge
-    mtu: 9000
-  - mac: "{{ br0_port0_mac }}"
-    master: br0
-    name: br0-port0
-    state: up
-    type: ethernet
-    mtu: 9000
diff --git a/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org
deleted file mode 100644
index 2957bf31b9..0000000000
--- a/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org
+++ /dev/null
@@ -1,36 +0,0 @@
----
-br0_ipv4: 10.3.170.16
-br0_ipv4_gw: 10.3.170.254
-br0_ipv4_nm: 24
-br0_port0_mac: "{{ mac1 }}"
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-has_ipv4: yes
-mac1: 50:6b:4b:6a:ba:60
-nbde: false
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-      gateway4: "{{ br0_ipv4_gw }}"
-    name: br0
-    state: up
-    type: bridge
-    mtu: 9000
-  - mac: "{{ br0_port0_mac }}"
-    master: br0
-    name: br0-port0
-    state: up
-    type: ethernet
-    mtu: 9000
diff --git a/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org
deleted file mode 100644
index b811ed21d3..0000000000
--- a/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org
+++ /dev/null
@@ -1,36 +0,0 @@
----
-br0_ipv4: 10.3.170.17
-br0_ipv4_gw: 10.3.170.254
-br0_ipv4_nm: 24
-br0_port0_mac: "{{ mac1 }}"
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-has_ipv4: yes
-mac1: 50:6b:4b:6b:07:00
-nbde: false
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-      gateway4: "{{ br0_ipv4_gw }}"
-    name: br0
-    state: up
-    type: bridge
-    mtu: 9000
-  - mac: "{{ br0_port0_mac }}"
-    master: br0
-    name: br0-port0
-    state: up
-    type: ethernet
-    mtu: 9000
diff --git a/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org
deleted file mode 100644
index c1dd8e3684..0000000000
--- a/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org
+++ /dev/null
@@ -1,36 +0,0 @@
----
-br0_ipv4: 10.3.170.18
-br0_ipv4_gw: 10.3.170.254
-br0_ipv4_nm: 24
-br0_port0_mac: "{{ mac1 }}"
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-has_ipv4: yes
-mac1: 50:6b:4b:6a:c2:00
-nbde: false
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-      gateway4: "{{ br0_ipv4_gw }}"
-    name: br0
-    state: up
-    type: bridge
-    mtu: 9000
-  - mac: "{{ br0_port0_mac }}"
-    master: br0
-    name: br0-port0
-    state: up
-    type: ethernet
-    mtu: 9000
diff --git a/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org
deleted file mode 100644
index 8c22a83feb..0000000000
--- a/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org
+++ /dev/null
@@ -1,36 +0,0 @@
----
-br0_ipv4: 10.3.170.19
-br0_ipv4_gw: 10.3.170.254
-br0_ipv4_nm: 24
-br0_port0_mac: "{{ mac1 }}"
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-has_ipv4: yes
-mac1: 50:6b:4b:6a:c9:70
-nbde: false
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-      gateway4: "{{ br0_ipv4_gw }}"
-    name: br0
-    state: up
-    type: bridge
-    mtu: 9000
-  - mac: "{{ br0_port0_mac }}"
-    master: br0
-    name: br0-port0
-    state: up
-    type: ethernet
-    mtu: 9000
diff --git a/inventory/host_vars/bvmhost-a64-10.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-10.iad2.fedoraproject.org
deleted file mode 100644
index da97f2bd7a..0000000000
--- a/inventory/host_vars/bvmhost-a64-10.iad2.fedoraproject.org
+++ /dev/null
@@ -1,36 +0,0 @@
----
-br0_ipv4: 10.3.170.20
-br0_ipv4_gw: 10.3.170.254
-br0_ipv4_nm: 24
-br0_port0_mac: "{{ mac1 }}"
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-has_ipv4: yes
-mac1: 50:6b:4b:6a:dd:a0
-nbde: false
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-      gateway4: "{{ br0_ipv4_gw }}"
-    name: br0
-    state: up
-    type: bridge
-    mtu: 9000
-  - mac: "{{ br0_port0_mac }}"
-    master: br0
-    name: br0-port0
-    state: up
-    type: ethernet
-    mtu: 9000
diff --git a/inventory/host_vars/bvmhost-a64-11.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-11.iad2.fedoraproject.org
deleted file mode 100644
index 75f753afa2..0000000000
--- a/inventory/host_vars/bvmhost-a64-11.iad2.fedoraproject.org
+++ /dev/null
@@ -1,36 +0,0 @@
----
-br0_ipv4: 10.3.170.22
-br0_ipv4_gw: 10.3.170.254
-br0_ipv4_nm: 24
-br0_port0_mac: "{{ mac1 }}"
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-has_ipv4: yes
-mac1: 50:6b:4b:6a:c2:50
-nbde: false
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-      gateway4: "{{ br0_ipv4_gw }}"
-    name: br0
-    state: up
-    type: bridge
-    mtu: 9000
-  - mac: "{{ br0_port0_mac }}"
-    master: br0
-    name: br0-port0
-    state: up
-    type: ethernet
-    mtu: 9000
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
index c2f3d2265b..baae0f2adb 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
@@ -1010,7 +1010,7 @@ host bvmhost-a64-04 {
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
-host bvmhost-a64-05 {
+host buildhw-a64-07 {
      hardware ethernet 50:6b:4b:6a:ef:70 ;
      fixed-address 10.3.170.15;
      filename "uefi/grubaa64.efi";
@@ -1018,7 +1018,7 @@ host bvmhost-a64-05 {
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
-host bvmhost-a64-06 {
+host buildhw-a64-08 {
      hardware ethernet 50:6b:4b:6a:ba:60 ;
      fixed-address 10.3.170.16;
      filename "uefi/grubaa64.efi";
@@ -1026,7 +1026,7 @@ host bvmhost-a64-06 {
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
-host bvmhost-a64-07 {
+host buildhw-a64-09 {
      hardware ethernet 50:6b:4b:6b:07:00 ;
      fixed-address 10.3.170.17;
      filename "uefi/grubaa64.efi";
@@ -1034,7 +1034,7 @@ host bvmhost-a64-07 {
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
-host bvmhost-a64-08 {
+host buildhw-a64-10 {
      hardware ethernet 50:6b:4b:6a:c2:00 ;
      fixed-address 10.3.170.18;
      filename "uefi/grubaa64.efi";
@@ -1042,7 +1042,7 @@ host bvmhost-a64-08 {
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
-host bvmhost-a64-09 {
+host buildhw-a64-11 {
      hardware ethernet 50:6b:4b:6a:c9:70 ;
      fixed-address 10.3.170.19;
      filename "uefi/grubaa64.efi";
@@ -1050,7 +1050,7 @@ host bvmhost-a64-09 {
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
-host bvmhost-a64-10 {
+host buildhw-a64-12 {
      hardware ethernet 50:6b:4b:6a:dd:a0 ;
      fixed-address 10.3.170.20;
      filename "uefi/grubaa64.efi";
@@ -1058,7 +1058,7 @@ host bvmhost-a64-10 {
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
-host bvmhost-a64-11 {
+host buildhw-a64-13 {
      hardware ethernet 50:6b:4b:6a:c2:50 ;
      fixed-address 10.3.170.22;
      filename "uefi/grubaa64.efi";
@@ -1518,40 +1518,40 @@ host bvmhost-a64-04-mgmt {
      fixed-address 10.3.160.104;
      option routers 10.3.160.254;
 }
-host bvmhost-a64-05-mgmt {
+host buildhw-a64-07-mgmt {
      hardware ethernet e8:6a:64:39:18:99;
      fixed-address 10.3.160.105;
-     option host-name "bvmhost-aarch64-05";
+     option host-name "buildhw-a64-07-mgmt";
 }
-host bvmhost-a64-06-mgmt {
+host buildhw-a64-08-mgmt {
      hardware ethernet E8:6A:64:39:18:60;
      fixed-address 10.3.160.106;
-     option host-name "bvmhost-aarch64-06";
+     option host-name "buildhw-a64-08-mgmt";
 }
-host bvmhost-a64-07-mgmt {
+host buildhw-a64-09-mgmt {
      hardware ethernet E8:6A:64:39:19:35;
      fixed-address 10.3.160.107;
-     option host-name "bvmhost-aarch64-07";
+     option host-name "buildhw-a64-09-mgmt";
 }
-host bvmhost-a64-08-mgmt {
+host buildhw-a64-10-mgmt {
      hardware ethernet E8:6A:64:39:19:68;
      fixed-address 10.3.160.108;
-     option host-name "bvmhost-aarch64-08";
+     option host-name "buildhw-a64-10-mgmt";
 }
-host bvmhost-a64-09-mgmt {
+host buildhw-a64-11-mgmt {
      hardware ethernet E8:6A:64:39:18:B2;
      fixed-address 10.3.160.109;
-     option host-name "buildvmhost-aarch64-11";
+     option host-name "buildhw-a64-11-mgmt";
 }
-host bvmhost-a64-10-mgmt {
+host buildhw-a64-12-mgmt {
      hardware ethernet E8:6A:64:39:18:95;
      fixed-address 10.3.160.110;
-     option host-name "buildvmhost-aarch64-13";
+     option host-name "buildhw-a64-12-mgmt";
 }
-host bvmhost-a64-11-mgmt {
+host buildhw-a64-13-mgmt {
      hardware ethernet E8:6A:64:39:19:69;
      fixed-address 10.3.160.111;
-     option host-name "buildvmhost-aarch64-15";
+     option host-name "buildhw-a64-13-mgmt";
 }
 host bvmhost-a64-osbs01-mgmt {
      hardware ethernet E8:6A:64:39:18:B3;