diff --git a/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org
index 5e0545197f..15fdb3bd17 100644
--- a/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-01.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.31
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
index dda2b7de2f..8d73c92e56 100644
--- a/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-02.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.32
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
index 9942263e39..14c0d93f8e 100644
--- a/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-03.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.33
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
index abda63e874..c49c71f5e6 100644
--- a/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-04.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.34
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org
index 924cc85122..be8f92fe5d 100644
--- a/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-05.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.35
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
index bb2dc4cf7f..f6c465c1df 100644
--- a/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-06.iad2.fedoraproject.org
@@ -2,4 +2,4 @@
 eth0_ip: 10.3.169.36
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
-
+eth1_off: true
diff --git a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
index bd85848471..8e12adf252 100644
--- a/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-07.iad2.fedoraproject.org
@@ -2,4 +2,4 @@
 eth0_ip: 10.3.169.37
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
-
+eth1_off: true
diff --git a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
index da4d691025..aaf96ea1a6 100644
--- a/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-08.iad2.fedoraproject.org
@@ -2,4 +2,4 @@
 eth0_ip: 10.3.169.38
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
-
+eth1_off: true
diff --git a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
index 0c0baf6897..274c084bc3 100644
--- a/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-09.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.39
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
index 400921f2c5..7164369170 100644
--- a/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-10.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.40
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
index 4bcfe5591e..e2875925d4 100644
--- a/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-11.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.41
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
index 842f6806c0..d009b07684 100644
--- a/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-12.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.42
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
index 4770acfdb7..5b8a0287e8 100644
--- a/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-13.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.43
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
index 5f0244a356..ead4eae474 100644
--- a/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-14.iad2.fedoraproject.org
@@ -2,4 +2,4 @@
 eth0_ip: 10.3.169.44
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
-
+eth1_off: true
diff --git a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
index a28dee11d9..18b5090e68 100644
--- a/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-15.iad2.fedoraproject.org
@@ -2,4 +2,5 @@
 eth0_ip: 10.3.169.45
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
+eth1_off: true
 
diff --git a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
index d982908108..392cb87ac0 100644
--- a/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x86-16.iad2.fedoraproject.org
@@ -2,4 +2,4 @@
 eth0_ip: 10.3.169.46
 eth0_ipv4_gw: 10.3.169.254
 datacenter: iad2
-
+eth1_off: true
diff --git a/roles/base/templates/ifcfg.j2 b/roles/base/templates/ifcfg.j2
index 0452ba0e8b..f9c305dd4c 100644
--- a/roles/base/templates/ifcfg.j2
+++ b/roles/base/templates/ifcfg.j2
@@ -8,7 +8,7 @@ OPTIONS="layer2=1 portno=0"
 {% endif %}
 {% if item in ansible_ifcfg_infra_net_devices %}
 DEFROUTE=yes
-GATEWAY="{{ hostvars[inventory_hostname][item + '_ipv4_gw'] }}"
+GATEWAY="{{ gw }}"
 {% endif %}
 {% if hostvars[inventory_hostname].datacenter == 'iad2' %}
 DOMAIN="iad2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org"
@@ -24,7 +24,11 @@ ONBOOT="no"
 {% else %}
 IPADDR="{{ hostvars[inventory_hostname][item + '_ip'] }}"
 NETMASK="{{ hostvars[inventory_hostname][item + '_nm'] }}"
+{% if hostvars[inventory_hostname][item +'_off'] is defined %}
+ONBOOT="no"
+{% else %}
 ONBOOT="yes"
+{% fi %}
 {% endif %}
 TYPE="Ethernet"
 DEVICE="{{item}}"