diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index d1f675b069..dfca6fb1de 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -99,7 +99,7 @@
   - apply interface-changes
   when: 
   - virthost is not defined
-  - item.startswith(('eth','br','enc','em'))
+  - item.startswith(('eth','br','enc','em','eno'))
   - hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether'
   - hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active']
   - ansible_distribution_major_version|int >=7
diff --git a/roles/base/templates/ifcfg.j2 b/roles/base/templates/ifcfg.j2
index 0e7ba2b861..749847624d 100644
--- a/roles/base/templates/ifcfg.j2
+++ b/roles/base/templates/ifcfg.j2
@@ -8,7 +8,13 @@ OPTIONS="layer2=1 portno=0"
 {% endif %}
 {% if item in ansible_ifcfg_infra_net_devices %}
 GATEWAY="{{gw}}"
+{%  if hostvars[inventory_hostname].datacenter == 'phx2' %}
 DOMAIN="phx2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org"
+{%  if hostvars[inventory_hostname].datacenter == 'iad2' %}
+DOMAIN="iad2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org"
+{% else %}
+DOMAIN="vpn.fedoraproject.org fedoraproject.org"
+{% endif %}
 DNS1="{{ dns1 }}"
 DNS2="{{ dns2 }}"
 {% endif %}