diff --git a/inventory/group_vars/cloud-hardware b/inventory/group_vars/cloud-hardware
index dc9c7e5598..ca5576bd9f 100644
--- a/inventory/group_vars/cloud-hardware
+++ b/inventory/group_vars/cloud-hardware
@@ -7,3 +7,4 @@ collectd_apache: false
 
 nagios_Check_Services:
   nrpe: true
+  swap: true
diff --git a/inventory/group_vars/faf-stg b/inventory/group_vars/faf-stg
index 44e8355efc..50147d2acd 100644
--- a/inventory/group_vars/faf-stg
+++ b/inventory/group_vars/faf-stg
@@ -7,3 +7,4 @@ sudoers: "{{ private }}/files/sudo/arm-retrace-sudoers"
 
 nagios_Check_Services:
   nrpe: false
+  swap: false
diff --git a/inventory/group_vars/retrace-stg b/inventory/group_vars/retrace-stg
index 37e995cd66..5701a48b07 100644
--- a/inventory/group_vars/retrace-stg
+++ b/inventory/group_vars/retrace-stg
@@ -8,3 +8,4 @@ root_auth_users: msuchy
 
 nagios_Check_Services:
   nrpe: false
+  swap: false
diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org
index 414070b1c2..4b5a839d5f 100644
--- a/inventory/host_vars/copr-be.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org
@@ -47,3 +47,4 @@ nagios_Check_Services:
   nrpe: true
   sshd: true
   httpd: true
+  swap: false
diff --git a/inventory/host_vars/copr-fe.cloud.fedoraproject.org b/inventory/host_vars/copr-fe.cloud.fedoraproject.org
index 9041d176be..78b28b084a 100644
--- a/inventory/host_vars/copr-fe.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-fe.cloud.fedoraproject.org
@@ -34,3 +34,4 @@ nagios_Check_Services:
   nrpe: true
   sshd: true
   httpd: true
+  swap: false
diff --git a/inventory/host_vars/copr-keygen.cloud.fedoraproject.org b/inventory/host_vars/copr-keygen.cloud.fedoraproject.org
index 8cd3c9947c..c660c8bac9 100644
--- a/inventory/host_vars/copr-keygen.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-keygen.cloud.fedoraproject.org
@@ -28,3 +28,4 @@ copr_hostbase: copr-keygen
 nagios_Check_Services:
   nrpe: true
   sshd: true
+  swap: false
diff --git a/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org b/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org
index b44e44b334..b9f2cb3dce 100644
--- a/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org
+++ b/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org
@@ -13,6 +13,7 @@ datacenter: phx2
 
 nagios_Check_Services: 
   nrpe: false
+  swap: false
 
 tcp_ports:
 - 22
diff --git a/inventory/host_vars/fed-cloud01.cloud.fedoraproject.org b/inventory/host_vars/fed-cloud01.cloud.fedoraproject.org
index fd17c0f77b..3589a63061 100644
--- a/inventory/host_vars/fed-cloud01.cloud.fedoraproject.org
+++ b/inventory/host_vars/fed-cloud01.cloud.fedoraproject.org
@@ -1,3 +1,4 @@
 ---
 nagios_Check_Services:
   nrpe: false
+  swap: false
diff --git a/inventory/host_vars/fed-cloud02.cloud.fedoraproject.org b/inventory/host_vars/fed-cloud02.cloud.fedoraproject.org
index fd17c0f77b..3589a63061 100644
--- a/inventory/host_vars/fed-cloud02.cloud.fedoraproject.org
+++ b/inventory/host_vars/fed-cloud02.cloud.fedoraproject.org
@@ -1,3 +1,4 @@
 ---
 nagios_Check_Services:
   nrpe: false
+  swap: false
diff --git a/inventory/host_vars/fed-cloud09.cloud.fedoraproject.org b/inventory/host_vars/fed-cloud09.cloud.fedoraproject.org
index dee6f4e15b..b3ce15a03a 100644
--- a/inventory/host_vars/fed-cloud09.cloud.fedoraproject.org
+++ b/inventory/host_vars/fed-cloud09.cloud.fedoraproject.org
@@ -8,5 +8,6 @@ ansible_ifcfg_blacklist: true
 nagios_Check_Services:
   nrpe: true
   sshd: true
+  swap: true
 
 baseiptables: False
diff --git a/inventory/host_vars/magazine.fedorainfracloud.org b/inventory/host_vars/magazine.fedorainfracloud.org
index 7b04615093..ac2758f80b 100644
--- a/inventory/host_vars/magazine.fedorainfracloud.org
+++ b/inventory/host_vars/magazine.fedorainfracloud.org
@@ -26,3 +26,4 @@ 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 66cf70283a..b6ff8cabeb 100644
--- a/inventory/host_vars/magazine2.fedorainfracloud.org
+++ b/inventory/host_vars/magazine2.fedorainfracloud.org
@@ -26,3 +26,4 @@ nagios_Check_Services:
   nrpe: true
   sshd: true
   httpd: true
+  swap: true