diff --git a/global-templates/services.conf b/global-templates/services.conf
index 34771bb..14e7710 100644
--- a/global-templates/services.conf
+++ b/global-templates/services.conf
@@ -53,7 +53,7 @@ apply Service "icinga" {
 
   check_command = "icinga"
 
-  assign where host.name == NodeName
+  assign where host.name
 }
 
 apply Service "icinga API certificate" {
@@ -69,7 +69,7 @@ apply Service "icinga API certificate" {
   vars.ssl_cert_warn = 30
   vars.ssl_cert_rootssl_cert = "/var/lib/icinga2/certs/ca.crt"
 
-  assign where host.name == NodeName
+  assign where host.name
 }
 
 apply Service "icinga CA certificate" {
@@ -83,7 +83,7 @@ apply Service "icinga CA certificate" {
   vars.ssl_cert_warn = 396
   vars.ssl_cert_critical = 376
 
-  assign where host.name == NodeName
+  assign where host.name
 }
 
 apply Service "kernel-status" {
@@ -98,8 +98,9 @@ apply Service "load" {
   import "generic-service"
 
   check_command = "load"
+  command_endpoint = host.name
 
-  assign where host.name == NodeName
+  assign where host.name
 }
 
 apply Service "pgsql " for (name => config in host.vars.pgsql_dbs) {
@@ -130,8 +131,9 @@ apply Service "procs" {
   import "generic-service"
 
   check_command = "procs"
+  command_endpoint = host.name
 
-  assign where host.name == NodeName
+  assign where host.name
 }
 
 apply Service "proc-" for (proc => config in host.vars.procs) {
@@ -162,6 +164,7 @@ apply Service "users" {
   import "generic-service"
 
   check_command = "users"
+  command_endpoint = host.name
 
-  assign where host.name == NodeName
+  assign where host.name
 }