diff --git a/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org
index 64b2af5cfe..566b594347 100644
--- a/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-02.iad2.fedoraproject.org
@@ -1,5 +1,45 @@
 ---
-gw: 10.3.170.254
-eth1_ip: 10.3.170.122
-eth1_ipv4_gw: 10.3.170.254
 datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth1_ipv4: 10.3.170.122
+eth1_ipv4_nm: 24
+eth1_ipv4_gw: 10.3.170.254
+ 
+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:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    type: ethernet
+    
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: up
+    type: ethernet
+    autoconnect: yes
+    ip:
+      address: 
+      - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+      gateway4: "{{ eth1_ipv4_gw }}"
+      dns: 
+      - "{{ dns1 }}"
+      - "{{ dns2 }}"
+      dns_search: 
+      - iad2.fedoraproject.org
+      - fedoraproject.org
+      dhcp4: no
+      auto6: no
+  
+  - name: eth2
+    mac: "{{ mac2 }}"
+    state: down
+    type: ethernet   
+  
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org
index 7c132d325e..7cb75db1c3 100644
--- a/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-03.iad2.fedoraproject.org
@@ -1,5 +1,50 @@
 ---
-gw: 10.3.170.254
-eth0_ip: 10.3.170.123
-eth0_ipv4_gw: 10.3.170.254
 datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.170.123
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.170.254
+ 
+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:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
+      
+  - name: eth2
+    mac: "{{ mac2 }}"
+    state: down
+    type: ethernet
+    
+  - name: eth3
+    mac: "{{ mac3 }}"
+    state: down
+    type: ethernet
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org
index fd3992c413..d2cf27b0e4 100644
--- a/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-04.iad2.fedoraproject.org
@@ -1,5 +1,50 @@
 ---
-gw: 10.3.170.254
-eth0_ip: 10.3.170.124
-eth0_ipv4_gw: 10.3.170.254
 datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.170.124
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.170.254
+
+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:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
+    
+  - name: eth2
+    mac: "{{ mac2 }}"
+    state: down
+    type: ethernet
+    
+  - name: eth3
+    mac: "{{ mac3 }}"
+    state: down
+    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org
index 3c562b6c4f..20087bffdd 100644
--- a/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-05.iad2.fedoraproject.org
@@ -1,5 +1,50 @@
 ---
-gw: 10.3.170.254
-eth0_ip: 10.3.170.125
-eth0_ipv4_gw: 10.3.170.254
 datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.170.125
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.170.254
+
+has_ipv6: no
+ 
+mac0: 00:01:73:02:09:c3
+mac1: ee:cb:e1:1b:27:6e
+mac2: f2:b7:9e:26:0d:9a
+mac3: ca:65:7a:c4:c8:83
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
+ 
+  - name: eth2
+    mac: "{{ mac2 }}"
+    state: down
+    type: ethernet
+    
+  - name: eth3
+    mac: "{{ mac3 }}"
+    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
index 5a57f1a68c..167760e63a 100644
--- a/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-06.iad2.fedoraproject.org
@@ -1,5 +1,50 @@
 ---
-gw: 10.3.170.254
-eth0_ip: 10.3.170.126
-eth0_ipv4_gw: 10.3.170.254
 datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.170.126
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.170.254
+
+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:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
+ 
+  - name: eth2
+    mac: "{{ mac2 }}"
+    state: down
+    type: ethernet
+    
+  - name: eth3
+    mac: "{{ mac3 }}"
+    state: down
+    type: ethernet
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org
index 1aa85048ef..83532d04cc 100644
--- a/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-11.iad2.fedoraproject.org
@@ -1,5 +1,50 @@
 ---
-gw: 10.3.170.254
-eth0_ip: 10.3.170.131
-eth0_ipv4_gw: 10.3.170.254
 datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.170.131
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.170.254
+
+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:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
+ 
+  - name: eth2
+    mac: "{{ mac2 }}"
+    state: down
+    type: ethernet
+    
+  - name: eth3
+    mac: "{{ mac3 }}"
+    state: down
+    type: ethernet
diff --git a/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org b/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org
index dd147d2d88..e45e7841e0 100644
--- a/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-19.iad2.fedoraproject.org
@@ -1,5 +1,50 @@
 ---
-gw: 10.3.170.254
-eth0_ip: 10.3.170.139
-eth0_ipv4_gw: 10.3.170.254
 datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.170.139
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.170.254
+
+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:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
+ 
+  - name: eth2
+    mac: "{{ mac2 }}"
+    state: down
+    type: ethernet
+    
+  - name: eth3
+    mac: "{{ mac3 }}"
+    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
index 3b0e902e0e..a208c727c5 100644
--- a/inventory/host_vars/buildhw-a64-20.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-a64-20.iad2.fedoraproject.org
@@ -1,5 +1,50 @@
 ---
-gw: 10.3.170.254
-eth0_ip: 10.3.170.140
-eth0_ipv4_gw: 10.3.170.254
 datacenter: iad2
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.170.140
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.170.254
+
+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:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
+ 
+  - name: eth2
+    mac: "{{ mac2 }}"
+    state: down
+    type: ethernet
+    
+  - name: eth3
+    mac: "{{ mac3 }}"
+    state: down
+    type: ethernet
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
index cdbe174b60..ea8601dafb 100644
--- a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
@@ -1,8 +1,38 @@
 ---
-eth0_ip: 10.3.169.32
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.32
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
 
-nm: 255.255.255.0
-dns: 10.3.163.33
+has_ipv6: no
+ 
+mac0: 14:9e:cf:61:9e:61
+mac1: 14:9e:cf:61:9e:64
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
diff --git a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
index 34c5ff55cd..199bb9133e 100644
--- a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
@@ -1,8 +1,38 @@
 ---
-eth0_ip: 10.3.169.33
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.33
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
 
-nm: 255.255.255.0
-dns: 10.3.163.33
+has_ipv6: no
+ 
+mac0: 14:9e:cf:61:9e:c9
+mac1: 14:9e:cf:61:9e:cc
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
index 164fc4a92c..4781c16c51 100644
--- a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
@@ -1,8 +1,38 @@
 ---
-eth0_ip: 10.3.169.34
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.34
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
 
-nm: 255.255.255.0
-dns: 10.3.163.33
+has_ipv6: no
+ 
+mac0: 14:9e:cf:61:a5:07
+mac1: 14:9e:cf:61:a5:0a
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
index bcf60c7ca1..a5ef49d83b 100644
--- a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
@@ -1,7 +1,39 @@
 ---
-eth0_ip: 10.3.169.36
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
-nm: 255.255.255.0
-dns: 10.3.163.33
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.36
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
+
+has_ipv6: no
+ 
+mac0: 14:9e:cf:61:a0:bd
+mac1: 14:9e:cf:61:a0:c0
+
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
index 0bd5194379..a464c88af5 100644
--- a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
@@ -1,7 +1,38 @@
 ---
-eth0_ip: 10.3.169.37
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
-nm: 255.255.255.0
-dns: 10.3.163.33
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.37
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
+
+has_ipv6: no
+ 
+mac0: 14:9e:cf:61:9e:e3 
+mac1: 14:9e:cf:61:9e:e6 
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
diff --git a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
index 92234c3acc..1e963b27f7 100644
--- a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
@@ -1,7 +1,39 @@
 ---
-eth0_ip: 10.3.169.38
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
-nm: 255.255.255.0
-dns: 10.3.163.33
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.38
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
+
+has_ipv6: no
+ 
+mac0: 14:9e:cf:61:a6:75
+mac1: 14:9e:cf:61:a6:78 
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
+ 
diff --git a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
index cddc85bf4f..e013a8b8a3 100644
--- a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
@@ -1,8 +1,38 @@
 ---
-eth0_ip: 10.3.169.39
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.39
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
 
-nm: 255.255.255.0
-dns: 10.3.163.33
+has_ipv6: no
+ 
+mac0: f8:ca:b8:f7:26:e1
+mac1: f8:ca:b8:f7:26:e4 
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
index c9f1f8a915..c3ce6a4034 100644
--- a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
@@ -1,8 +1,38 @@
 ---
-eth0_ip: 10.3.169.40
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.40
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
 
-nm: 255.255.255.0
-dns: 10.3.163.33
+has_ipv6: no
+ 
+mac0: f8:ca:b8:f7:27:cf
+mac1: f8:ca:b8:f7:27:d2
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
index ab01ee4ad2..f2bf68d3bf 100644
--- a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
@@ -1,8 +1,38 @@
 ---
-eth0_ip: 10.3.169.41
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.41
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
 
-nm: 255.255.255.0
-dns: 10.3.163.33
+has_ipv6: no
+ 
+mac0: f8:ca:b8:f7:27:63
+mac1: f8:ca:b8:f7:27:66
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
index 7485496b31..40bd3cdd96 100644
--- a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
@@ -1,8 +1,38 @@
 ---
-eth0_ip: 10.3.169.42
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.42
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
 
-nm: 255.255.255.0
-dns: 10.3.163.33
+has_ipv6: no
+ 
+mac0: f8:ca:b8:f7:2e:f5
+mac1: f8:ca:b8:f7:2e:f8
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
index 9964064b30..9f58b76ee4 100644
--- a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
@@ -1,8 +1,38 @@
 ---
-eth0_ip: 10.3.169.43
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.43
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
 
-nm: 255.255.255.0
-dns: 10.3.163.33
+has_ipv6: no
+ 
+mac0: f8:ca:b8:f7:27:49
+mac1: f8:ca:b8:f7:27:4c
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
index cac21f982e..db96838e58 100644
--- a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
@@ -1,7 +1,38 @@
 ---
-eth0_ip: 10.3.169.44
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
-nm: 255.255.255.0
-dns: 10.3.163.33
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.44
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
+
+has_ipv6: no
+ 
+mac0: f8:ca:b8:f7:2d:87
+mac1: f8:ca:b8:f7:2d:8a
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
diff --git a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
index f2ced179c7..b1cb56bdc9 100644
--- a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
@@ -1,8 +1,38 @@
 ---
-eth0_ip: 10.3.169.45
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.45
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
 
-nm: 255.255.255.0
-dns: 10.3.163.33
+has_ipv6: no
+ 
+mac0: f8:ca:b8:f7:26:fb
+mac1: f8:ca:b8:f7:26:fe
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file
diff --git a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
index d617ebd6e1..c4004283dd 100644
--- a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
@@ -1,7 +1,38 @@
 ---
-eth0_ip: 10.3.169.46
-gw: 10.3.169.254
 datacenter: iad2
-eth1_off: true
-nm: 255.255.255.0
-dns: 10.3.163.33
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+ 
+has_ipv4: yes
+eth0_ipv4: 10.3.169.46
+eth0_ipv4_nm: 24
+eth0_ipv4_gw: 10.3.169.254
+
+has_ipv6: no
+ 
+mac0: f8:ca:b8:f7:29:3d
+mac1: f8:ca:b8:f7:29:40
+
+network_connections:
+  - name: eth0
+    mac: "{{ mac0 }}"
+    state: down
+    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
+
+  - name: eth1
+    mac: "{{ mac1 }}"
+    state: down
+    type: ethernet
+    autoconnect: yes
\ No newline at end of file