diff --git a/inventory/group_vars/osbs-masters b/inventory/group_vars/osbs-masters
index b31d79531b..127d511613 100644
--- a/inventory/group_vars/osbs-masters
+++ b/inventory/group_vars/osbs-masters
@@ -22,3 +22,11 @@ osbs_client_conf_path: /etc/osbs.conf
 
 openshift_node_labels: {'region':'infra'}
 openshift_schedulable: False
+
+nagios_Check_Services:
+  nrpe: true
+  sshd: true
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
diff --git a/inventory/group_vars/osbs-masters-stg b/inventory/group_vars/osbs-masters-stg
index 629928e5ba..0ae00e72c1 100644
--- a/inventory/group_vars/osbs-masters-stg
+++ b/inventory/group_vars/osbs-masters-stg
@@ -8,3 +8,11 @@ tcp_ports: [ 80, 443, 8443]
 
 openshift_node_labels: {'region':'infra'}
 openshift_schedulable: False
+
+nagios_Check_Services:
+  nrpe: true
+  sshd: true
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
diff --git a/inventory/group_vars/osbs-nodes b/inventory/group_vars/osbs-nodes
index 32d7ed66c0..b05656f688 100644
--- a/inventory/group_vars/osbs-nodes
+++ b/inventory/group_vars/osbs-nodes
@@ -19,3 +19,11 @@ osbs_koji_username: "kojibuilder"
 koji_url: "koji.fedoraproject.org"
 
 osbs_client_conf_path: /etc/osbs.conf
+
+nagios_Check_Services:
+  nrpe: true
+  sshd: true
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
diff --git a/inventory/group_vars/osbs-nodes-stg b/inventory/group_vars/osbs-nodes-stg
index 54de320771..fd8002c4e8 100644
--- a/inventory/group_vars/osbs-nodes-stg
+++ b/inventory/group_vars/osbs-nodes-stg
@@ -7,3 +7,11 @@ num_cpus: 2
 tcp_ports: [ 80, 443, 8443, 10250]
 
 openshift_node_labels: {'region': 'primary', 'zone': 'default'}
+
+nagios_Check_Services:
+  nrpe: true
+  sshd: true
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
diff --git a/inventory/group_vars/osbsworker-masters-stg b/inventory/group_vars/osbsworker-masters-stg
index c1e595cf37..e43099e455 100644
--- a/inventory/group_vars/osbsworker-masters-stg
+++ b/inventory/group_vars/osbsworker-masters-stg
@@ -22,3 +22,11 @@ osbs_client_conf_path: /etc/osbs.conf
 
 openshift_node_labels: {'region':'infra'}
 openshift_schedulable: False
+
+nagios_Check_Services:
+  nrpe: true
+  sshd: true
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
diff --git a/inventory/group_vars/osbsworker-nodes-stg b/inventory/group_vars/osbsworker-nodes-stg
index 4bf8de294e..18c7761c26 100644
--- a/inventory/group_vars/osbsworker-nodes-stg
+++ b/inventory/group_vars/osbsworker-nodes-stg
@@ -21,3 +21,11 @@ koji_url: "koji.stg.fedoraproject.org"
 osbs_client_conf_path: /etc/osbs.conf
 
 openshift_node_labels: {'region': 'primary', 'zone': 'default'}
+
+nagios_Check_Services:
+  nrpe: true
+  sshd: true
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false
diff --git a/inventory/host_vars/magazine.fedorainfracloud.org b/inventory/host_vars/magazine.fedorainfracloud.org
deleted file mode 100644
index ac2758f80b..0000000000
--- a/inventory/host_vars/magazine.fedorainfracloud.org
+++ /dev/null
@@ -1,29 +0,0 @@
----
-image: rhel7-20141015
-instance_type: m1.large
-keypair: fedora-admin-20130801
-security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,web-443-anywhere-persistent,allow-nagios-persistent,default,all-icmp-persistent
-zone: nova
-tcp_ports: [22, 80, 443]
-
-inventory_tenant: persistent
-inventory_instance_name: magazine
-hostbase: magazine
-public_ip: 209.132.184.123
-root_auth_users: nb chrisroberts
-description: Fedora Magazine
-
-host_backup_targets: ['/backups', '/var/www/html']
-dbs_to_backup: ['wp']
-mariadb_root_password: "{{ magazine_mariadb_password }}"
-extra_enablerepos: ''
-
-cloud_networks:
-  # persistent-net
-  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
-
-nagios_Check_Services:
-  nrpe: true
-  sshd: true
-  httpd: true
-  swap: true
diff --git a/inventory/host_vars/magazine2.fedorainfracloud.org b/inventory/host_vars/magazine2.fedorainfracloud.org
index b6ff8cabeb..0fd10a52d1 100644
--- a/inventory/host_vars/magazine2.fedorainfracloud.org
+++ b/inventory/host_vars/magazine2.fedorainfracloud.org
@@ -26,4 +26,4 @@ nagios_Check_Services:
   nrpe: true
   sshd: true
   httpd: true
-  swap: true
+  swap: false
diff --git a/inventory/host_vars/retrace01.qa.fedoraproject.org b/inventory/host_vars/retrace01.qa.fedoraproject.org
index aaf1bd378c..690c67df33 100644
--- a/inventory/host_vars/retrace01.qa.fedoraproject.org
+++ b/inventory/host_vars/retrace01.qa.fedoraproject.org
@@ -5,3 +5,11 @@ rs_use_faf_packages: true
 # we do not have enough storage on stg
 rs_internal_fedora_vers: [24, 25, 26, rawhide]
 rs_internal_arch_list: [source, x86_64, i386]
+
+nagios_Check_Services:
+  nrpe: true
+  sshd: true
+  named: false
+  dhcpd: false
+  httpd: false
+  swap: false