diff --git a/inventory/builders b/inventory/builders
index c37e9a313f..26344f1914 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -140,26 +140,12 @@ 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-x86-01.iad2.fedoraproject.org
 buildhw-x86-02.iad2.fedoraproject.org
 buildhw-x86-03.iad2.fedoraproject.org
diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index c8fa89f129..3758155323 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -63,13 +63,6 @@ iad2_management_hosts:
   - bvmhost-a64-02.mgmt.iad2.fedoraproject.org.
   - bvmhost-a64-03.mgmt.iad2.fedoraproject.org.
   - bvmhost-a64-04.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 3050821444..26ee8d92a4 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -97,16 +97,7 @@ vmhost-p08-copr02.rdu-cc.fedoraproject.org
 vmhost-p09-copr01.rdu-cc.fedoraproject.org
 
 [appliedmicro]
-buildhw-a64-01.iad2.fedoraproject.org
-buildhw-a64-02.iad2.fedoraproject.org
 bvmhost-a64-01.stg.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
@@ -117,21 +108,10 @@ openqa-a64-worker06.iad2.fedoraproject.org
 storinator01.rdu-cc.fedoraproject.org
 
 [aarch64]
-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
 openqa-a64-worker01.iad2.fedoraproject.org
 openqa-a64-worker02.iad2.fedoraproject.org
 openqa-a64-worker03.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org
deleted file mode 100644
index c2f9a5504d..0000000000
--- a/inventory/host_vars/buildhw-a64-01.iad2.fedoraproject.org
+++ /dev/null
@@ -1,29 +0,0 @@
----
-datacenter: iad2
-eth1_ip: 10.3.170.121
-eth1_ipv4_gw: 10.3.170.254
-gw: 10.3.170.254
-network_connections:
-  - autoconnect: no
-    mac: 68:05:ca:8e:ab:e6
-    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:08:50
-    name: eth1
-    state: up
-    type: ethernet
-  - autoconnect: no
-    mac: 50:6b:4b:6b:08:51
-    name: eth2
-    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org
deleted file mode 100644
index 00eef26778..0000000000
--- a/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org
+++ /dev/null
@@ -1,37 +0,0 @@
----
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-eth1_ipv4: 10.3.170.122
-eth1_ipv4_gw: 10.3.170.254
-eth1_ipv4_nm: 24
-has_ipv4: yes
-has_ipv6: no
-mac0: 00:1b:21:de:34:63
-mac1: 50:6b:4b:6a:ec:90
-mac2: 50:6b:4b:6a:ec:91
-network_connections:
-  - mac: "{{ mac0 }}"
-    name: eth0
-    state: down
-    type: ethernet
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - iad2.fedoraproject.org
-        - fedoraproject.org
-      gateway4: "{{ eth1_ipv4_gw }}"
-    mac: "{{ mac1 }}"
-    name: eth1
-    state: up
-    type: ethernet
-  - mac: "{{ mac2 }}"
-    name: eth2
-    state: down
-    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-07.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-07.iad2.fedoraproject.org
deleted file mode 100644
index c37b6dd009..0000000000
--- a/inventory/host_vars/buildhw-a64-07.iad2.fedoraproject.org
+++ /dev/null
@@ -1,29 +0,0 @@
----
-datacenter: iad2
-eth1_ip: 10.3.170.15
-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.15/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
deleted file mode 100644
index aa676bdb75..0000000000
--- a/inventory/host_vars/buildhw-a64-08.iad2.fedoraproject.org
+++ /dev/null
@@ -1,29 +0,0 @@
----
-datacenter: iad2
-eth1_ip: 10.3.170.16
-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.16/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
deleted file mode 100644
index af4c50df45..0000000000
--- a/inventory/host_vars/buildhw-a64-09.iad2.fedoraproject.org
+++ /dev/null
@@ -1,29 +0,0 @@
----
-datacenter: iad2
-eth1_ip: 10.3.170.17
-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.17/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
deleted file mode 100644
index 8bcdf6ab57..0000000000
--- a/inventory/host_vars/buildhw-a64-10.iad2.fedoraproject.org
+++ /dev/null
@@ -1,29 +0,0 @@
----
-datacenter: iad2
-eth1_ip: 10.3.170.18
-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.18/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
deleted file mode 100644
index 005de6e5d1..0000000000
--- a/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org
+++ /dev/null
@@ -1,29 +0,0 @@
----
-datacenter: iad2
-eth1_ip: 10.3.170.19
-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.19/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
deleted file mode 100644
index 1bcb1ef4fe..0000000000
--- a/inventory/host_vars/buildhw-a64-12.iad2.fedoraproject.org
+++ /dev/null
@@ -1,29 +0,0 @@
----
-datacenter: iad2
-eth1_ip: 10.3.170.20
-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.20/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
deleted file mode 100644
index 718fb6fc0d..0000000000
--- a/inventory/host_vars/buildhw-a64-13.iad2.fedoraproject.org
+++ /dev/null
@@ -1,29 +0,0 @@
----
-datacenter: iad2
-eth1_ip: 10.3.170.22
-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.22/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/buildhw-a64-19.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org
deleted file mode 100644
index a5a5730b9d..0000000000
--- a/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org
+++ /dev/null
@@ -1,41 +0,0 @@
----
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-eth0_ipv4: 10.3.170.139
-eth0_ipv4_gw: 10.3.170.254
-has_ipv4: yes
-has_ipv6: no
-mac0: f4:e9:d4:cc:2f:f4
-mac1: f4:e9:d4:cc:2f:f5
-mac2: f4:e9:d4:f2:e7:f4
-mac3: f4:e9:d4:f2:e7:f5
-network_connections:
-  - ip:
-      address:
-        - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - iad2.fedoraproject.org
-        - fedoraproject.org
-      gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ mac0 }}"
-    name: eth0
-    state: up
-    type: ethernet
-  - autoconnect: yes
-    mac: "{{ mac1 }}"
-    name: eth1
-    state: down
-    type: ethernet
-  - mac: "{{ mac2 }}"
-    name: eth2
-    state: down
-    type: ethernet
-  - mac: "{{ mac3 }}"
-    name: eth3
-    state: down
-    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-20.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-20.iad2.fedoraproject.org
deleted file mode 100644
index c18a0bc9d0..0000000000
--- a/inventory/host_vars/buildhw-a64-20.iad2.fedoraproject.org
+++ /dev/null
@@ -1,41 +0,0 @@
----
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-eth0_ipv4: 10.3.170.140
-eth0_ipv4_gw: 10.3.170.254
-has_ipv4: yes
-has_ipv6: no
-mac0: f4:e9:d4:cc:32:b2
-mac1: f4:e9:d4:cc:32:b3
-mac2: f4:e9:d4:f2:e9:6e
-mac3: f4:e9:d4:f2:e9:6f
-network_connections:
-  - ip:
-      address:
-        - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - iad2.fedoraproject.org
-        - fedoraproject.org
-      gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ mac0 }}"
-    name: eth0
-    state: up
-    type: ethernet
-  - autoconnect: yes
-    mac: "{{ mac1 }}"
-    name: eth1
-    state: down
-    type: ethernet
-  - mac: "{{ mac2 }}"
-    name: eth2
-    state: down
-    type: ethernet
-  - mac: "{{ mac3 }}"
-    name: eth3
-    state: down
-    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org
deleted file mode 100644
index 7127c00175..0000000000
--- a/inventory/host_vars/buildhw-a64-21.iad2.fedoraproject.org
+++ /dev/null
@@ -1,39 +0,0 @@
----
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-eth1_ipv4: 10.3.170.151
-eth1_ipv4_gw: 10.3.170.254
-eth1_ipv4_nm: 24
-freezes: true
-has_ipv4: yes
-mac0: 68:05:ca:8e:9b:86
-mac1: 50:6b:4b:6a:b6:20
-mac2: 50:6b:4b:6a:b6:21
-mgmt_ipv4: "10.3.160.114"
-mgmt_mac: "e8:6a:64:39:18:ef"
-nested: true
-network_connections:
-  - autoconnect: no
-    mac: "{{ mac0 }}"
-    name: eth0
-    type: ethernet
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - iad2.fedoraproject.org
-        - fedoraproject.org
-      gateway4: "{{ eth1_ipv4_gw }}"
-    mac: "{{ mac1 }}"
-    name: eth1
-    state: up
-    type: ethernet
-  - autoconnect: no
-    mac: "{{ mac2 }}"
-    name: eth2
-    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org
deleted file mode 100644
index bcf791366d..0000000000
--- a/inventory/host_vars/buildhw-a64-22.iad2.fedoraproject.org
+++ /dev/null
@@ -1,38 +0,0 @@
----
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-eth1_ipv4: 10.3.170.152
-eth1_ipv4_gw: 10.3.170.254
-eth1_ipv4_nm: 24
-freezes: true
-has_ipv4: yes
-mac0: 68:05:ca:8a:f0:29
-mac1: 50:6b:4b:6a:eb:b0
-mac2: 50:6b:4b:6a:eb:b1
-mgmt_ipv4: "10.3.160.116"
-mgmt_mac: "E8:6A:64:39:18:73"
-network_connections:
-  - autoconnect: no
-    mac: "{{ mac0 }}"
-    name: eth0
-    type: ethernet
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - iad2.fedoraproject.org
-        - fedoraproject.org
-      gateway4: "{{ eth1_ipv4_gw }}"
-    mac: "{{ mac1 }}"
-    name: eth1
-    state: up
-    type: ethernet
-  - autoconnect: no
-    mac: "{{ mac2 }}"
-    name: eth2
-    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org
deleted file mode 100644
index 22825b5435..0000000000
--- a/inventory/host_vars/buildhw-a64-23.iad2.fedoraproject.org
+++ /dev/null
@@ -1,38 +0,0 @@
----
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-eth1_ipv4: 10.3.170.153
-eth1_ipv4_gw: 10.3.170.254
-eth1_ipv4_nm: 24
-freezes: true
-has_ipv4: yes
-mac0: 00:1b:21:dc:4e:32
-mac1: 50:6b:4b:6a:ea:60
-mac2: 50:6b:4b:6a:ea:61
-mgmt_ipv4: "10.3.160.117"
-mgmt_mac: "E8:6A:64:39:19:67"
-network_connections:
-  - autoconnect: no
-    mac: "{{ mac0 }}"
-    name: eth0
-    type: ethernet
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - iad2.fedoraproject.org
-        - fedoraproject.org
-      gateway4: "{{ eth1_ipv4_gw }}"
-    mac: "{{ mac1 }}"
-    name: eth1
-    state: up
-    type: ethernet
-  - autoconnect: no
-    mac: "{{ mac2 }}"
-    name: eth2
-    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org
deleted file mode 100644
index 49dc44c6df..0000000000
--- a/inventory/host_vars/buildhw-a64-24.iad2.fedoraproject.org
+++ /dev/null
@@ -1,39 +0,0 @@
----
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-eth1_ipv4: 10.3.170.154
-eth1_ipv4_gw: 10.3.170.254
-eth1_ipv4_nm: 24
-freezes: true
-has_ipv4: yes
-mac0: 68:05:CA:8E:98:C7
-mac1: 50:6B:4B:6A:C4:90
-mac2: 50:6B:4B:6A:C4:91
-mgmt_ipv4: "10.3.160.118"
-mgmt_mac: "E8:6A:64:39:19:67"
-nested: true
-network_connections:
-  - autoconnect: no
-    mac: "{{ mac0 }}"
-    name: eth0
-    type: ethernet
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - iad2.fedoraproject.org
-        - fedoraproject.org
-      gateway4: "{{ eth1_ipv4_gw }}"
-    mac: "{{ mac1 }}"
-    name: eth1
-    state: up
-    type: ethernet
-  - autoconnect: no
-    mac: "{{ mac2 }}"
-    name: eth2
-    type: ethernet
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 0f69d33380..fb564a1d85 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
@@ -1010,78 +1010,6 @@ host bvmhost-a64-04 {
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
-host buildhw-a64-07 {
-     hardware ethernet 50:6b:4b:6a:ef:70 ;
-     fixed-address 10.3.170.15;
-     filename "uefi/grubaa64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.170.254;
-     option subnet-mask 255.255.255.0;
-}
-host buildhw-a64-08 {
-     hardware ethernet 50:6b:4b:6a:ba:60 ;
-     fixed-address 10.3.170.16;
-     filename "uefi/grubaa64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.170.254;
-     option subnet-mask 255.255.255.0;
-}
-host buildhw-a64-09 {
-     hardware ethernet 50:6b:4b:6b:07:00 ;
-     fixed-address 10.3.170.17;
-     filename "uefi/grubaa64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.170.254;
-     option subnet-mask 255.255.255.0;
-}
-host buildhw-a64-10 {
-     hardware ethernet 50:6b:4b:6a:c2:00 ;
-     fixed-address 10.3.170.18;
-     filename "uefi/grubaa64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.170.254;
-     option subnet-mask 255.255.255.0;
-}
-host buildhw-a64-11 {
-     hardware ethernet 50:6b:4b:6a:c9:70 ;
-     fixed-address 10.3.170.19;
-     filename "uefi/grubaa64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.170.254;
-     option subnet-mask 255.255.255.0;
-}
-host buildhw-a64-12 {
-     hardware ethernet 50:6b:4b:6a:dd:a0 ;
-     fixed-address 10.3.170.20;
-     filename "uefi/grubaa64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.170.254;
-     option subnet-mask 255.255.255.0;
-}
-host buildhw-a64-13 {
-     hardware ethernet 50:6b:4b:6a:c2:50 ;
-     fixed-address 10.3.170.22;
-     filename "uefi/grubaa64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.170.254;
-     option subnet-mask 255.255.255.0;
-}
-host buildhw-a64-19 {
-     hardware ethernet f4:e9:d4:cc:2f:f4;
-     fixed-address 10.3.170.139;
-     filename "uefi/grubaa64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.170.254;
-     option subnet-mask 255.255.255.0;
-}
-host buildhw-a64-20 {
-     hardware ethernet f4:e9:d4:cc:32:b2;
-     fixed-address 10.3.170.140;
-     filename "uefi/grubaa64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.170.254;
-     option subnet-mask 255.255.255.0;
-}
 host qvmhost-x86-01 {
      hardware ethernet E4:43:4B:A8:C1:FE;
      fixed-address 10.3.174.11;
@@ -1140,20 +1068,6 @@ host openqa-a64-worker03 {
      option subnet-mask 255.255.255.0;
 }
 
-host buildhw-a64-01 {
-     hardware ethernet 50:6b:4b:6b:08:50;
-     fixed-address 10.3.170.121;
-     option routers 10.3.170.254;
-     option host-name "buildhw-a64-01";
-}
-
-host buildhw-a64-02 {
-     hardware ethernet 50:6b:4b:6a:ec:90;
-     fixed-address 10.3.170.122;
-     option routers 10.3.170.254;
-     option host-name "buildhw-a64-02";
-}
-
 host openqa-a64-worker01-mgmt {
      hardware ethernet e8:6a:64:39:18:ef;
      fixed-address 10.3.160.114;