diff --git a/inventory/group_vars/iad2 b/inventory/group_vars/iad2
index c941b86b3c..1f9293d64a 100644
--- a/inventory/group_vars/iad2
+++ b/inventory/group_vars/iad2
@@ -11,7 +11,7 @@ ipa_server: ipa01.iad2.fedoraproject.org
 
 # for now, lets not monitor any of them from phx2.
 
-nagios_Can_Connect: false
+nagios_Can_Connect: true
 
 nagios_Check_Services:
   mail: false
diff --git a/inventory/host_vars/ipa01.iad2.fedoraproject.org b/inventory/host_vars/ipa01.iad2.fedoraproject.org
index 924f1eb505..1e53c4bb3a 100644
--- a/inventory/host_vars/ipa01.iad2.fedoraproject.org
+++ b/inventory/host_vars/ipa01.iad2.fedoraproject.org
@@ -9,12 +9,3 @@ eth0_ip: 10.3.163.54
 vmhost: vmhost-x86-02.iad2.fedoraproject.org
 datacenter: iad2
 
-nagios_Can_Connect: false
-
-nagios_Check_Services:
-  mail: false
-  nrpe: false
-  sshd: false
-  swap: false
-  ping: false
-  raid: false
diff --git a/inventory/host_vars/ipa02.iad2.fedoraproject.org b/inventory/host_vars/ipa02.iad2.fedoraproject.org
index 0e0455ce6e..b035eddd4b 100644
--- a/inventory/host_vars/ipa02.iad2.fedoraproject.org
+++ b/inventory/host_vars/ipa02.iad2.fedoraproject.org
@@ -9,12 +9,3 @@ eth0_ip: 10.3.163.55
 vmhost: vmhost-x86-03.iad2.fedoraproject.org
 datacenter: iad2
 
-nagios_Can_Connect: false
-
-nagios_Check_Services:
-  mail: false
-  nrpe: false
-  sshd: false
-  swap: false
-  ping: false
-  raid: false
diff --git a/inventory/host_vars/ns01.iad2.fedoraproject.org b/inventory/host_vars/ns01.iad2.fedoraproject.org
index 03624717ad..2639fdbe57 100644
--- a/inventory/host_vars/ns01.iad2.fedoraproject.org
+++ b/inventory/host_vars/ns01.iad2.fedoraproject.org
@@ -13,12 +13,3 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/
 vmhost: vmhost-x86-01.iad2.fedoraproject.org
 datacenter: iad2
 
-nagios_Can_Connect: false
-
-nagios_Check_Services:
-  mail: false
-  nrpe: false
-  sshd: false
-  swap: false
-  ping: false
-  raid: false
diff --git a/inventory/host_vars/ns02.iad2.fedoraproject.org b/inventory/host_vars/ns02.iad2.fedoraproject.org
index 15669108b5..e28d4378bc 100644
--- a/inventory/host_vars/ns02.iad2.fedoraproject.org
+++ b/inventory/host_vars/ns02.iad2.fedoraproject.org
@@ -13,12 +13,3 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL8-x86_64/
 vmhost: vmhost-x86-02.iad2.fedoraproject.org
 datacenter: iad2
 
-nagios_Can_Connect: false
-
-nagios_Check_Services:
-  mail: false
-  nrpe: false
-  sshd: false
-  swap: false
-  ping: false
-  raid: false
diff --git a/inventory/host_vars/sundries01.iad2.fedoraproject.org b/inventory/host_vars/sundries01.iad2.fedoraproject.org
index 01b99a2687..03491f1bed 100644
--- a/inventory/host_vars/sundries01.iad2.fedoraproject.org
+++ b/inventory/host_vars/sundries01.iad2.fedoraproject.org
@@ -16,12 +16,3 @@ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
 # install special cron jobs here.
 master_sundries_node: True
 
-nagios_Can_Connect: false
-
-nagios_Check_Services:
-  mail: false
-  nrpe: false
-  sshd: false
-  swap: false
-  ping: false
-  raid: false
diff --git a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2
index c987491fc9..d3111e50a8 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2
@@ -3,6 +3,6 @@
 define hostgroup {
         hostgroup_name  vpnclients
         alias           vpnclients
-        members         !bastion02.phx2.fedoraproject.org, {% for host in groups['all']|sort %}{% if ( hostvars[host].vpn == true ) and ( hostvars[host].nagios_Can_Connect == true ) %}{{host}},{% endif %} {% endfor %}
+        members         !bastion02.iad2.fedoraproject.org, {% for host in groups['all']|sort %}{% if ( hostvars[host].vpn == true ) and ( hostvars[host].nagios_Can_Connect == true ) %}{{host}},{% endif %} {% endfor %}
 
 }