diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml
index da4aa962e7..4150a32087 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -1,6 +1,5 @@
-# TODO: Generalize this, fix "hosts:" etc.
 - name: make nagios/noc server
-  hosts: nagios-phx
+  hosts: nagios
   user: root
   gather_facts: False
 
@@ -17,7 +16,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: make the box be real
-  hosts: nagios-phx
+  hosts: nagios
   user: root
   gather_facts: True
   accelerate: "{{ accelerated }}"
@@ -51,7 +50,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: deploy service-specific config
-  hosts: nagios-phx
+  hosts: nagios
   user: root
   gather_facts: True
   accelerate: "{{ accelerated }}"