diff --git a/global-templates/services.conf b/global-templates/services.conf
index 14e7710..02350fc 100644
--- a/global-templates/services.conf
+++ b/global-templates/services.conf
@@ -98,9 +98,8 @@ apply Service "load" {
   import "generic-service"
 
   check_command = "load"
-  command_endpoint = host.name
 
-  assign where host.name
+  assign where !host.vars.is_container
 }
 
 apply Service "pgsql " for (name => config in host.vars.pgsql_dbs) {
diff --git a/infra02sat.infra.cacert.org/hosts.conf b/infra02sat.infra.cacert.org/hosts.conf
index b2d70f6..fae9082 100644
--- a/infra02sat.infra.cacert.org/hosts.conf
+++ b/infra02sat.infra.cacert.org/hosts.conf
@@ -14,9 +14,6 @@ object Host "infra02sat.infra.cacert.org" {
   vars.is_container = true
   vars.debian_relase = 12
 
-  vars.ca_certs["Icinga master"] = {
-    ssl_cert_file = "/var/lib/icinga2/certs/ca.crt"
-  }
   vars.ca_certs["Puppet"] = {
     ssl_cert_file = "/var/lib/puppet/ssl/certs/ca.pem"
   }