diff --git a/manifests/icinga2/agent.pp b/manifests/icinga2/agent.pp
index dfd5fe9..e6cc6bf 100644
--- a/manifests/icinga2/agent.pp
+++ b/manifests/icinga2/agent.pp
@@ -1,49 +1,49 @@
 # Icinga2 agent configuration
 class profile::icinga2::agent {
   $features = hiera('icinga2::features')
   $icinga2_network = hiera('icinga2::network')
   $parent_zone = hiera('icinga2::parent_zone')
   $parent_endpoints = hiera('icinga2::parent_endpoints')
 
   include profile::icinga2::apt_config
 
   class {'::icinga2':
     confd    => false,
     features => $features,
   }
 
   class { '::icinga2::feature::api':
     accept_config   => true,
     accept_commands => true,
     zones           => {
       'ZoneName' => {
         endpoints => ['NodeName'],
         parent    => $parent_zone,
       },
     },
   }
 
   create_resources('::icinga2::object::endpoint', $parent_endpoints)
   ::icinga2::object::zone {$parent_zone:
     endpoints => keys($parent_endpoints),
   }
 
   @@::icinga2::object::endpoint {$::fqdn:
     target => "/etc/icinga2/zones.d/${::fqdn}.conf",
   }
 
   @@::icinga2::object::zone {$::fqdn:
-    endpoints => [$::fqdn],
+    endpoints => [$::fqdn, $::fqdn],
     parent    => $parent_zone,
     target    => "/etc/icinga2/zones.d/${::fqdn}.conf",
   }
 
   @@::icinga2::object::host {$::fqdn:
     address => ip_for_network($icinga2_network),
     target  => "/etc/icinga2/zones.d/${::fqdn}.conf",
   }
 
   icinga2::object::zone { 'global-templates':
     global => true,
   }
 }
diff --git a/manifests/icinga2/master.pp b/manifests/icinga2/master.pp
index 51dd66e..e94ca98 100644
--- a/manifests/icinga2/master.pp
+++ b/manifests/icinga2/master.pp
@@ -1,42 +1,42 @@
 # An icinga master host
 class profile::icinga2::master {
   $zonename = hiera('icinga2::master::zonename')
   $features = hiera('icinga2::features')
   $icinga2_network = hiera('icinga2::network')
 
   include profile::icinga2::apt_config
 
   class {'::icinga2':
     confd     => false,
     features  => $features,
     constants => {
       'ZoneName' => $zonename,
     },
   }
 
   class { '::icinga2::feature::api':
     accept_commands => true,
   }
 
   @@::icinga2::object::endpoint {$::fqdn:
     target => "/etc/icinga2/zones.d/${::fqdn}.conf",
   }
 
   @@::icinga2::object::zone {$zonename:
-    endpoints => [$::fqdn],
+    endpoints => [$::fqdn, $::fqdn],
     target    => "/etc/icinga2/zones.d/${::fqdn}.conf",
   }
 
   @@::icinga2::object::host {$::fqdn:
     address => ip_for_network($icinga2_network),
     target  => "/etc/icinga2/zones.d/${::fqdn}.conf",
   }
 
   ::Icinga2::Object::Host <<| |>>
   ::Icinga2::Object::Endpoint <<| |>>
   ::Icinga2::Object::Zone <<| |>>
 
   ::icinga2::object::zone { 'global-templates':
     global => true,
   }
 }