diff --git a/inventory/builders b/inventory/builders
index d2750efba4..dd001d6fd5 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -415,6 +415,8 @@ buildppcle
 buildarm
 buildaarch64
 buildvm-s390
+buildvm-s390x
+bkernel
 
 [builders-stg:children]
 buildarm-stg
diff --git a/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2
index 256809c850..168c3d476d 100644
--- a/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/staging-hosts.cfg.j2
@@ -1,7 +1,11 @@
 {% for host in groups['all'] %}
 {% if hostvars[host].datacenter == 'staging' %}
 define host {
+{% if hostvars[host].nagios_Check_Services['nrpe'] == true %}
    use                     defaulttemplate
+{% else %}
+  use                          mincheck
+{% endif %}
   host_name               {{ host }}
 {% if hostvars[host].ansible_hostname is defined %}
    alias                   {{ hostvars[host].ansible_hostname }}