diff --git a/roles/nagios_server/files/nagios/hosts/templates.cfg b/roles/nagios_server/files/nagios/hosts/templates.cfg
index d284e3a161..ecfc6e0f8c 100644
--- a/roles/nagios_server/files/nagios/hosts/templates.cfg
+++ b/roles/nagios_server/files/nagios/hosts/templates.cfg
@@ -28,20 +28,6 @@ define host {
     register                      0
 }
 
-define host {
-    name                          nocheck
-    check_command                 check-host-alive
-    max_check_attempts            8
-    checks_enabled                0
-    retain_status_information     0
-    retain_nonstatus_information  0
-    notification_interval         15
-    notifications_enabled         0
-    notification_options          d,r
-    contact_groups                fedora-sysadmin-ircbot
-    register                      0
-}
-
 define host {
     name                          autoqatemplate
     check_command                 check-host-alive
diff --git a/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
index e717f36bf6..5674832615 100644
--- a/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
@@ -4,7 +4,7 @@ define host {
 {% if hostvars[host].nagios_Check_Services['nrpe'] == true %}
    use                     defaulttemplate
 {% else %}
-  use                      nocheck
+  use                      mincheck
 {% endif %}
    host_name               {{ host }}
 {% if hostvars[host].ansible_hostname is defined %}