diff --git a/inventory/builders b/inventory/builders
index c89e245145..a95b37db5b 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -209,15 +209,6 @@ bvmhost-p09-01.stg.iad2.fedoraproject.org
 [buildhw]
 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-19.iad2.fedoraproject.org
 buildhw-a64-20.iad2.fedoraproject.org
 buildhw-a64-21.iad2.fedoraproject.org
diff --git a/inventory/hardware b/inventory/hardware
index 37753bc46b..d063cfb4e4 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -139,15 +139,6 @@ 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-19.iad2.fedoraproject.org
 buildhw-a64-20.iad2.fedoraproject.org
 buildhw-a64-21.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org
deleted file mode 100644
index 862da9a7f1..0000000000
--- a/inventory/host_vars/buildhw-a64-03.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.123
-eth0_ipv4_gw: 10.3.170.254
-has_ipv4: yes
-has_ipv6: no
-mac0: 00:01:73:02:08:83
-mac1: fe:2f:0f:b7:1c:1e
-mac2: e6:6d:96:cc:7a:cd
-mac3: d2:87:2a:46:d0:24
-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-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org
deleted file mode 100644
index 5e926e0fe3..0000000000
--- a/inventory/host_vars/buildhw-a64-04.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.124
-eth0_ipv4_gw: 10.3.170.254
-has_ipv4: yes
-has_ipv6: no
-mac0: 2c:59:e5:36:9a:53
-mac1: a6:df:61:ff:e4:3f
-mac2: da:2c:8f:e7:99:2b
-mac3: c2:ac:ba:0d:8c:db
-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-06.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org
deleted file mode 100644
index 0a858a954c..0000000000
--- a/inventory/host_vars/buildhw-a64-06.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.126
-eth0_ipv4_gw: 10.3.170.254
-has_ipv4: yes
-has_ipv6: no
-mac0: 2c:59:e5:36:9a:51
-mac1: ce:a6:3d:c6:22:51
-mac2: 66:19:15:4e:89:56
-mac3: 66:66:16:e5:59:df
-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-07.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-07.iad2.fedoraproject.org
deleted file mode 100644
index ac0d53c4c1..0000000000
--- a/inventory/host_vars/buildhw-a64-07.iad2.fedoraproject.org
+++ /dev/null
@@ -1,5 +0,0 @@
----
-datacenter: iad2
-eth0_ip: 10.3.170.127
-eth0_ipv4_gw: 10.3.170.254
-gw: 10.3.170.254
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 86a9efd330..0000000000
--- a/inventory/host_vars/buildhw-a64-09.iad2.fedoraproject.org
+++ /dev/null
@@ -1,5 +0,0 @@
----
-datacenter: iad2
-eth0_ip: 10.3.170.129
-eth0_ipv4_gw: 10.3.170.254
-gw: 10.3.170.254
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 dbe339d91e..0000000000
--- a/inventory/host_vars/buildhw-a64-10.iad2.fedoraproject.org
+++ /dev/null
@@ -1,5 +0,0 @@
----
-datacenter: iad2
-eth0_ip: 10.3.170.130
-eth0_ipv4_gw: 10.3.170.254
-gw: 10.3.170.254
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 ea727bcbf5..0000000000
--- a/inventory/host_vars/buildhw-a64-11.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.131
-eth0_ipv4_gw: 10.3.170.254
-has_ipv4: yes
-has_ipv6: no
-mac0: 00:01:73:02:08:ff
-mac1: 72:a3:68:ad:39:05
-mac2: 8a:93:68:8d:ca:cd
-mac3: ee:ef:b7:b9:28:8a
-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