diff --git a/inventory/inventory b/inventory/inventory
index c4cd8d7220..dbf6f40015 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -393,8 +393,8 @@ ns05.fedoraproject.org
 ns13.rdu2.fedoraproject.org
 
 [dns_external]
-ns01.iad2.fedoraproject.org
-ns02.iad2.fedoraproject.org
+ns-iad01.iad2.fedoraproject.org
+ns-iad02.iad2.fedoraproject.org
 ns02.fedoraproject.org
 ns05.fedoraproject.org
 
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 7467d85bba..49df4a5508 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -467,6 +467,7 @@
   template: src=nagios/hostgroups/{{item}}.j2 dest=/etc/nagios/hostgroups/{{item}} mode=0644 owner=root group=root
   with_items:
     - all-external.cfg
+    - vpnclients.cfg
   when: nagios_location == "external"
   tags:
   - nagios_server
diff --git a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
index 95b0b60b70..f3ad3bbae0 100644
--- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
@@ -13,7 +13,6 @@ define host {
   parents                      iad2-gw
 {% elif vars['nagios_location'] == 'external' %}
   address                      66.187.228.248
-  parents                      ibiblio-gw
 {% endif %}
 
 }