diff --git a/inventory/group_vars/kojipkgs b/inventory/group_vars/kojipkgs
index f833a068e2..1d295ff473 100644
--- a/inventory/group_vars/kojipkgs
+++ b/inventory/group_vars/kojipkgs
@@ -43,4 +43,5 @@ csi_relationship: |
       - koschei
       - external users downloading packages from koji.
 
-virt_install_command: "{{ virt_install_command_two_nic }}"
+nagios_Check_Services:
+  swap: false
diff --git a/inventory/group_vars/pdc_web b/inventory/group_vars/pdc_web
index b5afc3753d..a4fad53748 100644
--- a/inventory/group_vars/pdc_web
+++ b/inventory/group_vars/pdc_web
@@ -45,3 +45,6 @@ fedmsg_certs:
   - pdc.compose
   - pdc.rpms
   - pdc.images
+
+nagios_Check_Services:
+  swap: false
diff --git a/inventory/host_vars/db-datanommer01.iad2.fedoraproject.org b/inventory/host_vars/db-datanommer01.iad2.fedoraproject.org
index e8f341a259..3996c36a27 100644
--- a/inventory/host_vars/db-datanommer01.iad2.fedoraproject.org
+++ b/inventory/host_vars/db-datanommer01.iad2.fedoraproject.org
@@ -35,3 +35,6 @@ sar_script: /usr/local/bin/datagrepper_sar.py
 sar_script_user: root
 sar_output_file: datagrepper.csv
 sar_huge: true
+
+nagios_Check_Services:
+  swap: false
diff --git a/inventory/host_vars/log01.iad2.fedoraproject.org b/inventory/host_vars/log01.iad2.fedoraproject.org
index b559111b50..5cd0039d6c 100644
--- a/inventory/host_vars/log01.iad2.fedoraproject.org
+++ b/inventory/host_vars/log01.iad2.fedoraproject.org
@@ -21,3 +21,6 @@ mem_size: 16384
 num_cpus: 16
 
 #host_backup_targets: ['/var/log']
+
+nagios_Check_Services:
+  swap: false
diff --git a/inventory/host_vars/pagure02.fedoraproject.org b/inventory/host_vars/pagure02.fedoraproject.org
index c7c8ad7a24..cff919404c 100644
--- a/inventory/host_vars/pagure02.fedoraproject.org
+++ b/inventory/host_vars/pagure02.fedoraproject.org
@@ -36,3 +36,6 @@ sar_output_file: pagure.json
 
 # DB used:
 pagure_db_host: 127.0.0.1
+
+nagios_Check_Services:
+  swap: false