diff --git a/playbooks/nrpe.yml b/playbooks/nrpe.yml
index 8d326f5..319d337 100755
--- a/playbooks/nrpe.yml
+++ b/playbooks/nrpe.yml
@@ -24,10 +24,10 @@
             option: -r -w 0.8,0.8,0.8 -c 1.0,0.9,0.9
           check_swap:
             script: check_swap
-            option: -n ok -w 70% -c 80%
+            option: -n ok -w 20% -c 10%
           check_users:
             script: check_users
-            option: -w 3 -c 10
+            option: -w 3 -c 5
       tags: [ nrpe ]
 - hosts: all
   tasks:
diff --git a/playbooks/tasks/web/nagios-hosts.cfg.j2 b/playbooks/tasks/web/nagios-hosts.cfg.j2
index 6afc3a7..b8f28fe 100644
--- a/playbooks/tasks/web/nagios-hosts.cfg.j2
+++ b/playbooks/tasks/web/nagios-hosts.cfg.j2
@@ -108,6 +108,12 @@ define service {
 	check_command		check_nrpe!check_load
 	hostgroup_name		nagios-nrpe
 }
+define service {
+	use			ansible-generic-service
+	service_description	NRPE Check Swap
+	check_command		check_nrpe!check_swap
+	hostgroup_name		nagios-nrpe
+}
 
 # Hostgroups
 # Everything here is dynamically-generated based on tags from Netbox