diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 3678db902f..68e42d6947 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -59,6 +59,7 @@
 # Set up our base config.
 - name: /etc/nagios/nrpe.cfg
   template: src=nrpe.cfg.j2 dest=/etc/nagios/nrpe.cfg
+  when: not inventory_hostname.startswith('noc')
   notify:
   - restart nrpe
   tags:
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 6674d326f3..eaebb402e9 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -63,6 +63,11 @@
 
 - name: Copy specialized nrpe.cfg for nagios server
   copy: src=nrpe.cfg dest=/etc/nagios/nrpe.cfg mode=0644 group=root owner=root
+  notify:
+  - restart nrpe
+  tags:
+  - config
+  - nagios_server
 
 - name: Copy check_nagios_notifications.py
   copy: src=check_nagios_notifications.py dest=/usr/local/bin/check_nagios_notifications.py mode=0755 group=root owner=root