diff --git a/inventory/inventory b/inventory/inventory
index 4dbc58892d..8a295e18a7 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -438,11 +438,12 @@ iddev.fedorainfracloud.org
 [dhcp]
 dhcp01.phx2.fedoraproject.org
 
-[nagios]
-noc02.fedoraproject.org
+#[nagios]
+#noc02.fedoraproject.org
 
 [nagios-new]
 noc01.phx2.fedoraproject.org
+noc02.fedoraproject.org
 
 [notifs-backend]
 notifs-backend01.phx2.fedoraproject.org
diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index a29b119713..5a27e06820 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -31,6 +31,12 @@
     path: /nagios
     target: https://nagios.fedoraproject.org/nagios/
 
+  - role: httpd/redirect
+    name: nagios-external
+    website: admin.fedoraproject.org
+    path: /nagios-external
+    target: https://nagios.fedoraproject.org/nagios-external/
+
   - role: httpd/redirect
     name: docs
     website: fedoraproject.org
diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 675e708c3a..788671b493 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -40,15 +40,14 @@
   - role: httpd/reverseproxy
     website: nagios.fedoraproject.org
     destname: nagios
-    remotepath: /
+    remotepath: /nagios/
     proxyurl: http://noc01.phx2.fedoraproject.org
 
   - role: httpd/reverseproxy
-    website: admin.fedoraproject.org
+    website: nagios.fedoraproject.org
     destname: nagios-external
-    localpath: /nagios-external
-    remotepath: /nagios-external
-    proxyurl: http://noc02
+    remotepath: /nagios-external/
+    proxyurl: http://noc02.fedoraproject.org
 
   - role: httpd/reverseproxy
     website: lists.fedoraproject.org