diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 5e1e96379b..98a057a63b 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -267,5 +267,3 @@ nagios_Check_Services:
   httpd: false
 
 
-nagios_NoCheck_Services:
-  vpn: false
diff --git a/inventory/host_vars/bastion02.phx2.fedoraproject.org b/inventory/host_vars/bastion02.phx2.fedoraproject.org
index ba51c34361..84d1f969d8 100644
--- a/inventory/host_vars/bastion02.phx2.fedoraproject.org
+++ b/inventory/host_vars/bastion02.phx2.fedoraproject.org
@@ -15,5 +15,3 @@ ssh_hostnames:
 - bastion.fedoraproject.org
 - bastion02.fedoraproject.org
 
-nagios_NoCheck_Services:
-  vpn:true
diff --git a/inventory/host_vars/download-rdu01.fedoraproject.org b/inventory/host_vars/download-rdu01.fedoraproject.org
index d6218d696e..11a5061766 100644
--- a/inventory/host_vars/download-rdu01.fedoraproject.org
+++ b/inventory/host_vars/download-rdu01.fedoraproject.org
@@ -12,5 +12,3 @@ eth0_nm: 255.255.255.192
 eth1_ip: 172.31.1.1
 eth1_nm: 255.255.255.0
 
-nagios_NoCheck_Services:
-  vpn:true
diff --git a/inventory/host_vars/virthost-rdu01.fedoraproject.org b/inventory/host_vars/virthost-rdu01.fedoraproject.org
index 8b0bf26b30..aee4dcb363 100644
--- a/inventory/host_vars/virthost-rdu01.fedoraproject.org
+++ b/inventory/host_vars/virthost-rdu01.fedoraproject.org
@@ -10,5 +10,3 @@ br0_ip: 204.85.14.4
 br0_nm: 255.255.255.192
 vpn: true
 
-nagios_NoCheck_Services:
-  vpn:true
diff --git a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2
index f4d36727ab..6bab4ab103 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         {% for host in groups['all'] %}{% if ( hostvars[host].vpn is defined ) %}{{host}},{% endif %} {% endfor %}
+        members         {% for host in groups['all'] %}{% if ( hostvars[host].vpn == true ) %}{{host}},{% endif %} {% endfor %}
 
 }