diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
index 111d41edb8..eebb0b9b92 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2
@@ -1,13 +1,13 @@
 define hostgroup {
         hostgroup_name  dnsservers
         alias           DNS Servers
-        members         {% for host in groups["dns"] %} {{ host |replace(".phx2","") }} {% if !loop.last %}, {% endif %} {% endfor %}
+        members         {% for host in groups["dns"] %} {{ hostvars[host]['inventory_hostname_short'] }}.fedoraproject.org {% if !loop.last %}, {% endif %} {% endfor %}
 
 }
 
 define hostgroup {
         hostgroup_name proxies
         alias          Web Servers
-        members         {% for host in groups["proxies"] %} {{ host |replace(".phx2","") }} {% if !loop.last %}, {% endif %} {% endfor %}
+        members         {% for host in groups["proxies"] %} {{ hostvars[host]['inventory_hostname_short'] }}.fedoraproject.org {% if !loop.last %}, {% endif %} {% endfor %}
 
 }