diff --git a/playbooks/tasks/web/nagios-hosts.cfg.j2 b/playbooks/tasks/web/nagios-hosts.cfg.j2
index 5d3c6d5..ca292c2 100644
--- a/playbooks/tasks/web/nagios-hosts.cfg.j2
+++ b/playbooks/tasks/web/nagios-hosts.cfg.j2
@@ -78,13 +78,13 @@ define service {
 # Services for SNMP-capable hosts
 define service {
 	use			ansible-generic-service
-	service_description	SNMP Check Hostname
+	service_description	Hostname
 	check_command		check_snmp!-P 3 -a SHA -x AES -o 1.3.6.1.2.1.1.1.0 -U {{ secret_snmp_rouser_username }} -A {{ secret_snmp_rouser_password }} -X {{ secret_snmp_rouser_privacy_passphrase }} -r $HOSTNAME$ -L authPriv
 	hostgroup_name		snmp
 }
 define service {
 	use			ansible-generic-service
-	service_description	SNMP Check Disk
+	service_description	Disk Usage
 	check_command		check_snmp_storage_v3!^/$!80!90
 	hostgroup_name		snmp
 }
@@ -92,57 +92,57 @@ define service {
 # Services for NRPE-capable hosts
 define service {
 	use			ansible-generic-service
-	service_description	NRPE Check Disk
+	service_description	Disk Usage
 	check_command		check_nrpe!check_disk_all
 	hostgroup_name		nagios-nrpe
 }
 define service {
 	use			ansible-generic-service
-	service_description	NRPE Check Users
+	service_description	Users
 	check_command		check_nrpe!check_users
 	hostgroup_name		nagios-nrpe
 }
 define service {
 	use			ansible-generic-service
-	service_description	NRPE Check Load
+	service_description	CPU Load
 	check_command		check_nrpe!check_load
 	hostgroup_name		nagios-nrpe
 }
 # Systemd unit checks
 define service {
 	use			ansible-generic-service
-	service_description	NRPE Check Unit backup.service
+	service_description	Unit backup.service
 	check_command		check_nrpe!check_systemd_backup_service
 	hostgroup_name		nagios-nrpe
 }
 define service {
 	use			ansible-generic-service
-	service_description	NRPE Check Unit backup.timer
+	service_description	Unit backup.timer
 	check_command		check_nrpe!check_systemd_backup_timer
 	hostgroup_name		nagios-nrpe
 }
 define service {
 	use			ansible-generic-service
-	service_description	NRPE Check Unit ansible-pull.service
+	service_description	Unit ansible-pull.service
 	check_command		check_nrpe!check_systemd_ansiblepull_service
 	hostgroup_name		ansible-pull
 }
 define service {
 	use			ansible-generic-service
-	service_description	NRPE Check Unit ansible-pull.timer
+	service_description	Unit ansible-pull.timer
 	check_command		check_nrpe!check_systemd_ansiblepull_timer
 	hostgroup_name		ansible-pull
 }
 define service {
 	use			ansible-generic-service
-	service_description	NRPE Check Unit docker.service
+	service_description	Unit docker.service
 	check_command		check_nrpe!check_systemd_docker_service
 	hostgroup_name		nagios-nrpe
 }
 # Swap
 define service {
 	use			ansible-generic-service
-	service_description	NRPE Check Swap
+	service_description	Swap Usage
 	check_command		check_nrpe!check_swap
 	hostgroup_name		nagios-nrpeswap
 }