diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index f425e8e953..c927e973ed 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -12,13 +12,6 @@ define service {
   use                   disktemplate
 }
 
-define service {
-  hostgroup_name	hosted
-  service_description   Disk Space /srv
-  check_command		check_by_nrpe!check_disk_/srv
-  use                   disktemplate
-}
-
 define service {
   hostgroup_name        qahardware
   service_description   Disk Space /srv
diff --git a/roles/nagios_server/files/nagios/services/hosted.cfg b/roles/nagios_server/files/nagios/services/hosted.cfg
deleted file mode 100644
index 763261e6b3..0000000000
--- a/roles/nagios_server/files/nagios/services/hosted.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# This file is dead.
-#
diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg
index fac5e37e5b..daaec1e353 100644
--- a/roles/nagios_server/files/nrpe/nrpe.cfg
+++ b/roles/nagios_server/files/nrpe/nrpe.cfg
@@ -287,7 +287,6 @@ include_dir=/etc/nrpe.d/
 command[check_nrpe]=/bin/date
 command[check_users]=/usr/lib64/nagios/plugins/check_users -w 5 -c 10
 command[check_load]=/usr/lib64/nagios/plugins/check_load -w 15,10,5 -c 30,25,20
-command[check_hosted_load]=/usr/lib64/nagios/plugins/check_load -w 35,30,25 -c 70,60,50
 command[check_raid]=/usr/lib64/nagios/plugins/check_raid.py
 command[check_disk_/]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /
 command[check_disk_/u01]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /u01
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 66bcf12683..872d176357 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -182,7 +182,6 @@
     - file_age.cfg
     - fmn.cfg
     - haproxy.cfg
-    - hosted.cfg
     - ipa.cfg
     - koji.cfg
     - koschei.cfg