diff --git a/inventory/host_vars/noc01.phx2.fedoraproject.org b/inventory/host_vars/noc01.phx2.fedoraproject.org
index f241a92ce0..ac009d063b 100644
--- a/inventory/host_vars/noc01.phx2.fedoraproject.org
+++ b/inventory/host_vars/noc01.phx2.fedoraproject.org
@@ -31,3 +31,6 @@ csi_relationship: |
     - Infrastructure team to be awair of the infra status. operations control process will fail
     - if this host is down, it will be difficult to know the status of infra and provide reactive/proactive support
     - if this host is down, dhcp/bootp leases/renew will fail. pxe booting will fail as well
+
+nagios_srcdir: 'nagios'
+nagios_location: 'internal'
diff --git a/inventory/host_vars/noc02.fedoraproject.org b/inventory/host_vars/noc02.fedoraproject.org
index 04d336bacd..8a24a900e0 100644
--- a/inventory/host_vars/noc02.fedoraproject.org
+++ b/inventory/host_vars/noc02.fedoraproject.org
@@ -31,3 +31,6 @@ csi_relationship: |
     - Infrastructure team to be awair of the infra status. operations control process will be affected
     - if this host is down, it will be difficult to know the status of infra and provide reactive/proactive support
 
+nagios_srcdir: 'nagios'
+nagios_location: 'external'
+
diff --git a/vars/nagios-new.noc01.yml b/vars/nagios-new.noc01.yml
deleted file mode 100644
index c435e55134..0000000000
--- a/vars/nagios-new.noc01.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nagios_srcdir: 'nagios'
-nagios_location: 'internal'
diff --git a/vars/nagios-new.noc02.yml b/vars/nagios-new.noc02.yml
deleted file mode 100644
index c68e2ca5f3..0000000000
--- a/vars/nagios-new.noc02.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nagios_srcdir: 'nagios'
-nagios_location: 'external'
diff --git a/vars/nagios.nagios01.yml b/vars/nagios.nagios01.yml
deleted file mode 100644
index 212b62ac0a..0000000000
--- a/vars/nagios.nagios01.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nagios_srcdir: 'nagios'
-
diff --git a/vars/nagios.noc01.stg.yml b/vars/nagios.noc01.stg.yml
deleted file mode 100644
index 212b62ac0a..0000000000
--- a/vars/nagios.noc01.stg.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nagios_srcdir: 'nagios'
-