diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml
index 90acfa7e49..c5c153dc5f 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -38,7 +38,7 @@
   - include: "{{ handlers_path }}/restart_services.yml"
 
 - name: deploy service-specific config (just for production)
-  hosts: nagios-new
+  hosts: nagios
   user: root
   gather_facts: True
 
diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg
index bf4e854885..fac5e37e5b 100644
--- a/roles/nagios_server/files/nrpe/nrpe.cfg
+++ b/roles/nagios_server/files/nrpe/nrpe.cfg
@@ -32,7 +32,7 @@ debug=0
 # number.  The file is only written if the NRPE daemon is started by the root
 # user and is running in standalone mode.
 
-pid_file=/var/run/nrpe/nrpe.pid
+#pid_file=/var/run/nrpe.pid
 
 
 
diff --git a/roles/nagios_server/templates/nagios/hosts/phx2-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/phx2-hosts.cfg.j2
index ddf9af9691..7c5dbb3d34 100644
--- a/roles/nagios_server/templates/nagios/hosts/phx2-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/phx2-hosts.cfg.j2
@@ -85,7 +85,6 @@ define host {
 define host {
   host_name                    virthost20.phx2.fedoraproject.org
   alias                        virthost20.phx2.fedoraproject.org
-  use                          mincheck
   check_command                check-host-alive
   address                      10.5.126.160
   parents                      phx2-gw
@@ -96,7 +95,11 @@ define host {
 {% for host in groups['all'] %}
 {% if hostvars[host].datacenter == 'phx2' %}
 define host {
+{% if hostvars[host].nagios_services['nrpe'] == true %}
    use                     defaulttemplate
+{% else %}
+  use                          mincheck
+{% endif %}
   host_name               {{ host }}
 {% if hostvars[host].ansible_hostname is defined %}
    alias                   {{ hostvars[host].ansible_hostname }}