diff --git a/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org
index 5f6fb96068..07469a25fd 100644
--- a/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-31.iad2.fedoraproject.org
@@ -4,29 +4,4 @@ datacenter: iad2
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 
-has_ipv4: yes
-eth0_ipv4: 10.3.170.144
-eth0_ipv4_nm: 24
-eth0_ipv4_gw: 10.3.170.254
-
-has_ipv6: no
-
-mac0: 52:54:00:9e:67:92
-
-network_connections:
-- name: eth0
-  mac: "{{ mac0 }}"
-  state: up
-  type: ethernet
-  ip:
-    address:
-    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-    gateway4: "{{ eth0_ipv4_gw }}"
-    dns:
-    - "{{ dns1 }}"
-    - "{{ dns2 }}"
-    dns_search:
-    - iad2.fedoraproject.org
-    - fedoraproject.org
-    dhcp4: no
-    auto6: no
+eth0_ip: 10.3.170.144
diff --git a/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org
index ab4a900705..2c777a9546 100644
--- a/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-32.iad2.fedoraproject.org
@@ -4,29 +4,4 @@ datacenter: iad2
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 
-has_ipv4: yes
-eth0_ipv4: 10.3.170.145
-eth0_ipv4_nm: 24
-eth0_ipv4_gw: 10.3.170.254
-
-has_ipv6: no
-
-mac0: 52:54:00:48:3e:a3
-
-network_connections:
-- name: eth0
-  mac: "{{ mac0 }}"
-  state: up
-  type: ethernet
-  ip:
-    address:
-    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-    gateway4: "{{ eth0_ipv4_gw }}"
-    dns:
-    - "{{ dns1 }}"
-    - "{{ dns2 }}"
-    dns_search:
-    - iad2.fedoraproject.org
-    - fedoraproject.org
-    dhcp4: no
-    auto6: no
+eth0_ip: 10.3.170.145
diff --git a/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org
index 6e3bd10d77..dca4648728 100644
--- a/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a32-33.iad2.fedoraproject.org
@@ -4,29 +4,4 @@ datacenter: iad2
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 
-has_ipv4: yes
-eth0_ipv4: 10.3.170.146
-eth0_ipv4_nm: 24
-eth0_ipv4_gw: 10.3.170.254
-
-has_ipv6: no
-
-mac0: 52:54:00:ec:06:17
-
-network_connections:
-- name: eth0
-  mac: "{{ mac0 }}"
-  state: up
-  type: ethernet
-  ip:
-    address:
-    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-    gateway4: "{{ eth0_ipv4_gw }}"
-    dns:
-    - "{{ dns1 }}"
-    - "{{ dns2 }}"
-    dns_search:
-    - iad2.fedoraproject.org
-    - fedoraproject.org
-    dhcp4: no
-    auto6: no
+eth0_ip: 10.3.170.146
diff --git a/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org
index f1b81928c8..e0ff0fa77e 100644
--- a/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-31.iad2.fedoraproject.org
@@ -4,29 +4,4 @@ datacenter: iad2
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 
-has_ipv4: yes
-eth0_ipv4: 10.3.170.141
-eth0_ipv4_nm: 24
-eth0_ipv4_gw: 10.3.170.254
-
-has_ipv6: no
-
-mac0: 52:54:00:cd:15:88
-
-network_connections:
-- name: eth0
-  mac: "{{ mac0 }}"
-  state: up
-  type: ethernet
-  ip:
-    address:
-    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-    gateway4: "{{ eth0_ipv4_gw }}"
-    dns:
-    - "{{ dns1 }}"
-    - "{{ dns2 }}"
-    dns_search:
-    - iad2.fedoraproject.org
-    - fedoraproject.org
-    dhcp4: no
-    auto6: no
+eth0_ip: 10.3.170.141
diff --git a/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org
index 7ea20d4b96..dbeee1cd3c 100644
--- a/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-32.iad2.fedoraproject.org
@@ -4,29 +4,4 @@ datacenter: iad2
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 
-has_ipv4: yes
-eth0_ipv4: 10.3.170.142
-eth0_ipv4_nm: 24
-eth0_ipv4_gw: 10.3.170.254
-
-has_ipv6: no
-
-mac0: 52:54:00:91:82:01
-
-network_connections:
-- name: eth0
-  mac: "{{ mac0 }}"
-  state: up
-  type: ethernet
-  ip:
-    address:
-    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-    gateway4: "{{ eth0_ipv4_gw }}"
-    dns:
-    - "{{ dns1 }}"
-    - "{{ dns2 }}"
-    dns_search:
-    - iad2.fedoraproject.org
-    - fedoraproject.org
-    dhcp4: no
-    auto6: no
+eth0_ip: 10.3.170.142
diff --git a/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org
index f0c8f4c023..d138a9ca3a 100644
--- a/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-33.iad2.fedoraproject.org
@@ -4,29 +4,4 @@ datacenter: iad2
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 
-has_ipv4: yes
-eth0_ipv4: 10.3.170.143
-eth0_ipv4_nm: 24
-eth0_ipv4_gw: 10.3.170.254
-
-has_ipv6: no
-
-mac0: 52:54:00:37:5c:1d
-
-network_connections:
-- name: eth0
-  mac: "{{ mac0 }}"
-  state: up
-  type: ethernet
-  ip:
-    address:
-    - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-    gateway4: "{{ eth0_ipv4_gw }}"
-    dns:
-    - "{{ dns1 }}"
-    - "{{ dns2 }}"
-    dns_search:
-    - iad2.fedoraproject.org
-    - fedoraproject.org
-    dhcp4: no
-    auto6: no
+eth0_ip: 10.3.170.143