diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index 6db857f912..3f07552955 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -59,6 +59,22 @@ iad2_management_hosts:
   - backup01.mgmt.iad2.fedoraproject.org
   - bkernel01.mgmt.iad2.fedoraproject.org
   - bkernel02.mgmt.iad2.fedoraproject.org
+  - bvmhost-a64-01.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-02.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-03.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-04.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-05.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-06.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-07.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-08.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-09.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-10.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-11.mgmt.iad2.fedoraproject.org.
+  - bvmhost-a64-osbs-01.mgmt.iad2.fedoraproject.org.
+  - bvmhost-p09-01.mgmt.iad2.fedoraproject.org.
+  - bvmhost-p09-02.mgmt.iad2.fedoraproject.org.
+  - bvmhost-p09-03.mgmt.iad2.fedoraproject.org.
+  - bvmhost-p09-04.mgmt.iad2.fedoraproject.org.
   - bvmhost-x86-01.mgmt.iad2.fedoraproject.org
   - bvmhost-x86-02.mgmt.iad2.fedoraproject.org
   - bvmhost-x86-03.mgmt.iad2.fedoraproject.org
@@ -66,6 +82,7 @@ iad2_management_hosts:
   - bvmhost-x86-05.mgmt.iad2.fedoraproject.org
   - bvmhost-x86-06.mgmt.iad2.fedoraproject.org
   - bvmhost-x86-07.mgmt.iad2.fedoraproject.org
+  - bvmhost-x86-08.mgmt.iad2.fedoraproject.org
   - dell-fx01-fc01.mgmt.iad2.fedoraproject.org
   - dell-fx01-fc02.mgmt.iad2.fedoraproject.org
   - dell-fx01-fc03.mgmt.iad2.fedoraproject.org
@@ -84,7 +101,15 @@ iad2_management_hosts:
   - dell-fx02-fc07.mgmt.iad2.fedoraproject.org
   - dell-fx02-fc08.mgmt.iad2.fedoraproject.org
   - dell-fx02.mgmt.iad2.fedoraproject.org
+  - openqa-a64-worker01.mgmt.iad2.fedoraproject.org
+  - openqa-a64-worker02.mgmt.iad2.fedoraproject.org
+  - openqa-a64-worker03.mgmt.iad2.fedoraproject.org
   - openqa-x86-worker01.mgmt.iad2.fedoraproject.org
+  - openqa-x86-worker02.mgmt.iad2.fedoraproject.org
+  - openqa-x86-worker03.mgmt.iad2.fedoraproject.org
+  - openqa-x86-worker04.mgmt.iad2.fedoraproject.org
+  - openqa-x86-worker05.mgmt.iad2.fedoraproject.org
+  - openqa-x86-worker06.mgmt.iad2.fedoraproject.org
   - qvmhost-x86-01.mgmt.iad2.fedoraproject.org
   - qvmhost-x86-02.mgmt.iad2.fedoraproject.org
   - vmhost-x86-01.mgmt.iad2.fedoraproject.org
@@ -94,6 +119,31 @@ iad2_management_hosts:
   - vmhost-x86-05.mgmt.iad2.fedoraproject.org
   - vmhost-x86-06.mgmt.iad2.fedoraproject.org
   - vmhost-x86-07.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-08.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-09.mgmt.iad2.fedoraproject.org
+  - bvmhost-a64-01-stg.mgmt.iad2.fedoraproject.org
+  - bvmhost-p08-01-stg.mgmt.iad2.fedoraproject.org
+  - bvmhost-x86-01-stg.mgmt.iad2.fedoraproject.org
+  - bvmhost-x86-02-stg.mgmt.iad2.fedoraproject.org
+  - bvmhost-x86-03-stg.mgmt.iad2.fedoraproject.org
+  - bvmhost-x86-04-stg.mgmt.iad2.fedoraproject.org
+  - bvmhost-x86-05-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-ocp01-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-ocp02-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-ocp03-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-ocp04-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-01-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-02-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-03-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-04-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-05-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-06-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-07-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-08-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-09-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-10-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-11-stg.mgmt.iad2.fedoraproject.org
+  - vmhost-x86-12-stg.mgmt.iad2.fedoraproject.org
 #
 # These are management interfaces we only want
 # to test ping against. No http/https