diff --git a/inventory/group_vars/ec2 b/inventory/group_vars/ec2
index 9efae62a32..a84312b5ec 100644
--- a/inventory/group_vars/ec2
+++ b/inventory/group_vars/ec2
@@ -8,6 +8,7 @@
 # Disable ethX ifcfg, let amazon handle these via DHCP.
 ansible_ifcfg_blacklist: true
 
+datacenter: aws
 nagios_Check_Services:
   mail: false
   nrpe: false
diff --git a/inventory/host_vars/aarch64-test01.fedorainfracloud.org b/inventory/host_vars/aarch64-test01.fedorainfracloud.org
index 8b00e0afaf..da647d4501 100644
--- a/inventory/host_vars/aarch64-test01.fedorainfracloud.org
+++ b/inventory/host_vars/aarch64-test01.fedorainfracloud.org
@@ -1,2 +1,13 @@
 ---
 datacenter: aws
+
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/aarch64-test02.fedorainfracloud.org b/inventory/host_vars/aarch64-test02.fedorainfracloud.org
index 8b00e0afaf..da647d4501 100644
--- a/inventory/host_vars/aarch64-test02.fedorainfracloud.org
+++ b/inventory/host_vars/aarch64-test02.fedorainfracloud.org
@@ -1,2 +1,13 @@
 ---
 datacenter: aws
+
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/iddev.fedorainfracloud.org b/inventory/host_vars/iddev.fedorainfracloud.org
index 663837729d..9ea20834d2 100644
--- a/inventory/host_vars/iddev.fedorainfracloud.org
+++ b/inventory/host_vars/iddev.fedorainfracloud.org
@@ -2,3 +2,14 @@
 ansible_ifcfg_blacklist: true
 datacenter: aws
 tcp_ports: [22, 80, 443]
+
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
+  ping: false
+  raid: false
diff --git a/inventory/host_vars/simple-koji-ci-prod.fedorainfracloud.org b/inventory/host_vars/simple-koji-ci-prod.fedorainfracloud.org
index 6da72a3366..2258d98eac 100644
--- a/inventory/host_vars/simple-koji-ci-prod.fedorainfracloud.org
+++ b/inventory/host_vars/simple-koji-ci-prod.fedorainfracloud.org
@@ -1,3 +1,14 @@
 ---
 tcp_ports: [22]
 datacenter: aws
+
+nagios_Check_Services:
+  mail: false
+  nrpe: false
+  sshd: false
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
+  ping: false
+  raid: false