diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml
index f444407912..610b2d21c8 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -42,7 +42,7 @@
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-   - /srv/web/infra/ansible/vars/nagios.{{ inventory_hostname_short }}.yml
+   - "/srv/web/infra/ansible/vars/nagios.{{ inventory_hostname }}.yml"
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
diff --git a/vars/nagios.noc01.yml b/vars/nagios.noc01.phx2.fedoraproject.org.yml
similarity index 100%
rename from vars/nagios.noc01.yml
rename to vars/nagios.noc01.phx2.fedoraproject.org.yml
diff --git a/vars/nagios.noc02.yml b/vars/nagios.noc02.fedoraproject.org.yml
similarity index 100%
rename from vars/nagios.noc02.yml
rename to vars/nagios.noc02.fedoraproject.org.yml