diff --git a/src/icinga2/install-service.sh b/src/icinga2/install-service.sh
index c6f3c6a..e45b991 100644
--- a/src/icinga2/install-service.sh
+++ b/src/icinga2/install-service.sh
@@ -86,11 +86,28 @@ object ApiUser "director" {
 EOF
 
 cat > /etc/icinga2/features-available/influxdb2-writer.conf <<EOF
-object Influxdb2Writer "influxdb2-writer" {
-  host = "http://127.0.0.1:8086"
+  host = "127.0.0.1"
+  port = 8086
   organization = "icinga"
   bucket = "icinga"
   auth_token = "${INFLUX_ICINGA_TOKEN}"
+  
+  flush_threshold = 1024
+  flush_interval = 10s
+
+  host_template = {
+    measurement = "$host.check_command$"
+    tags = {
+      hostname = "$host.name$"
+    }
+  }
+  service_template = {
+    measurement = "$service.check_command$"
+    tags = {
+      hostname = "$host.name$"
+      service = "$service.name$"
+    }
+  }
 }
 EOF
 cat > /etc/icinga2/zones.conf <<EOF