diff --git a/etc/icinga2/conf.d/generic-host.conf b/etc/icinga2/conf.d/generic-host.conf
index 7a23a285b..3094fd2cd 100644
--- a/etc/icinga2/conf.d/generic-host.conf
+++ b/etc/icinga2/conf.d/generic-host.conf
@@ -7,7 +7,7 @@ template Host "generic-host" {
 }
 
 template Host "linux-server" inherits "generic-host" {
-  groups = [ "linux-servers" ],
+  groups += [ "linux-servers" ],
 
   services["ping4"] = {
     templates = [ "generic-service" ],
@@ -19,7 +19,7 @@ template Host "linux-server" inherits "generic-host" {
 }
 
 template Host "windows-server" inherits "generic-host" {
-  groups = [ "windows-servers" ],
+  groups += [ "windows-servers" ],
 
   services["ping4"] = {
     templates = [ "generic-service" ],
diff --git a/etc/icinga2/conf.d/localhost.conf b/etc/icinga2/conf.d/localhost.conf
index c0dcefe6d..3d363f082 100644
--- a/etc/icinga2/conf.d/localhost.conf
+++ b/etc/icinga2/conf.d/localhost.conf
@@ -3,12 +3,9 @@
  * in the conf.d directory (e.g. one per host). By default all *.conf
  * files in this directory are included.
  */
-object Host "localhost" inherits "generic-host" {
-
+object Host "localhost" inherits "linux-server" {
   display_name = "localhost",
 
-  groups = [ "linux-servers", "windows-servers" ],
- 
   services["ping4"] = {
     templates = [ "generic-service" ],