diff --git a/templates/definition/charger/eebus.yaml b/templates/definition/charger/eebus.yaml
index 7b0ceb200..8909b8743 100644
--- a/templates/definition/charger/eebus.yaml
+++ b/templates/definition/charger/eebus.yaml
@@ -8,6 +8,7 @@ capabilities: ["mA"]
 requirements:
   evcc: ["eebus"]
 params:
-  - preset: eebus-meter
+  - preset: eebus
 render: |
-  {{ include "eebus-meter" . }}
+  {{ include "eebus" . }}
+  meter: true
diff --git a/templates/definition/charger/elli-charger-connect.yaml b/templates/definition/charger/elli-charger-connect.yaml
index 85223a0aa..46b6f978b 100644
--- a/templates/definition/charger/elli-charger-connect.yaml
+++ b/templates/definition/charger/elli-charger-connect.yaml
@@ -21,8 +21,8 @@ requirements:
 
       The support is in beta state and problems can occur!
 params:
-  - preset: eebus-no-meter
+  - preset: eebus
   - name: ip
     required: true
 render: |
-  {{ include "eebus-no-meter" . }}
+  {{ include "eebus" . }}
diff --git a/templates/definition/charger/elli-charger-pro.yaml b/templates/definition/charger/elli-charger-pro.yaml
index 56f4382d5..d30be709b 100644
--- a/templates/definition/charger/elli-charger-pro.yaml
+++ b/templates/definition/charger/elli-charger-pro.yaml
@@ -21,9 +21,10 @@ requirements:
 
       The support is in beta state and problems can occur!
 params:
-  - preset: eebus-meter
+  - preset: eebus
   - name: ip
     required: true
 render: |
-  {{ include "eebus-meter" . }}
+  {{ include "eebus" . }}
+  meter: true
   chargedEnergy: false
diff --git a/templates/definition/charger/porsche-pmcc.yaml b/templates/definition/charger/porsche-pmcc.yaml
index c403fcfdc..9d1c84b3e 100644
--- a/templates/definition/charger/porsche-pmcc.yaml
+++ b/templates/definition/charger/porsche-pmcc.yaml
@@ -7,6 +7,7 @@ capabilities: ["iso151182", "mA"]
 requirements:
   evcc: ["eebus"]
 params:
-  - preset: eebus-meter
+  - preset: eebus
 render: |
-  {{ include "eebus-meter" . }}
+  {{ include "eebus" . }}
+  meter: true
diff --git a/templates/definition/charger/porsche-pmcp.yaml b/templates/definition/charger/porsche-pmcp.yaml
index 2e3f87ece..3c119b890 100644
--- a/templates/definition/charger/porsche-pmcp.yaml
+++ b/templates/definition/charger/porsche-pmcp.yaml
@@ -6,6 +6,7 @@ products:
 requirements:
   evcc: ["eebus"]
 params:
-  - preset: eebus-meter
+  - preset: eebus
 render: |
-  {{ include "eebus-meter" . }}
+  {{ include "eebus" . }}
+  meter: true
diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml
index 1b6fa85f1..eafb1eef4 100644
--- a/util/templates/defaults.yaml
+++ b/util/templates/defaults.yaml
@@ -321,11 +321,7 @@ presets:
   vehicle-language:
     params:
       - name: language
-  eebus-meter:
-    params:
-      - name: ski
-      - name: ip
-  eebus-no-meter:
+  eebus:
     params:
       - name: ski
       - name: ip
diff --git a/util/templates/documentation.tpl b/util/templates/documentation.tpl
index c8b820413..d87564576 100644
--- a/util/templates/documentation.tpl
+++ b/util/templates/documentation.tpl
@@ -1,6 +1,5 @@
 {{- define "param" }}
-  {{ .Name }}:
-  {{- if .Value }} {{ .Value }} {{- end }}
+  {{ .Name }}:{{ if .Value }} {{ .Value }}{{ end }}
   {{- range .Values }}
   - {{ . }}
   {{- end }}
@@ -9,7 +8,7 @@
 
 {{- define "header" }}
   type: template
-  template: {{ $.Template }}
+  template: {{ .Template }}
   {{- if hasKey . "Usage" }}
   usage: {{ .Usage }}
   {{- end }}
@@ -18,7 +17,7 @@
 {{- define "default" }}
   {{- include "header" . }}
   {{- $usage := "" }}{{ if hasKey . "Usage" }}{{ $usage = .Usage }}{{ end }}
-  {{- range $.Params }}
+  {{- range .Params }}
   {{- if eq .Name "modbus" }}
   {{- $.Modbus | indent 2 }}
   {{- else if and (not .IsAdvanced) (or (not $usage) (not .Usages) (has $usage .Usages)) }}
@@ -30,7 +29,7 @@
 {{- define "advanced" }}
   {{- include "header" . }}
   {{- $usage := "" }}{{ if hasKey . "Usage" }}{{ $usage = .Usage }}{{ end }}
-  {{- range $.Params }}
+  {{- range .Params }}
   {{- if eq .Name "modbus" }}
   {{- $.Modbus | indent 2 }}
   {{- else if or (not $usage) (not .Usages) (has $usage .Usages) }}
diff --git a/util/templates/documentation_modbus.tpl b/util/templates/documentation_modbus.tpl
index 190f9ce5f..cc6640860 100644
--- a/util/templates/documentation_modbus.tpl
+++ b/util/templates/documentation_modbus.tpl
@@ -6,7 +6,7 @@ id: {{ .id }}
 device: {{ .device }} # USB-RS485 Adapter Adresse
 baudrate: {{ .baudrate }} # Prüfe die Geräteeinstellungen, typische Werte sind 9600, 19200, 38400, 57600, 115200
 comset: "{{ .comset }}" # Kommunikationsparameter für den Adapter
-{{- end -}}
+{{- end }}
 {{- if .rs485tcpip }}
 
 # RS485 via TCP/IP (Modbus RTU)
@@ -14,7 +14,7 @@ modbus: rs485tcpip
 id: {{ .id }}
 host: {{ .host }} # Hostname
 port: {{ .port }} # Port
-{{- end -}}
+{{- end }}
 {{- if .tcpip }}
 
 # Modbus TCP
diff --git a/util/templates/includes/eebus-meter.tpl b/util/templates/includes/eebus-meter.tpl
deleted file mode 100644
index a4c5b7e22..000000000
--- a/util/templates/includes/eebus-meter.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{ define "eebus-meter" }}
-type: eebus
-ski: {{ .ski }}
-{{ if .ip }}ip: {{ .ip }}{{ end }}
-meter: true
-{{- end }}
diff --git a/util/templates/includes/eebus-no-meter.tpl b/util/templates/includes/eebus.tpl
similarity index 70%
rename from util/templates/includes/eebus-no-meter.tpl
rename to util/templates/includes/eebus.tpl
index 93a65bfdb..db81f30cd 100644
--- a/util/templates/includes/eebus-no-meter.tpl
+++ b/util/templates/includes/eebus.tpl
@@ -1,4 +1,4 @@
-{{ define "eebus-no-meter" }}
+{{ define "eebus" }}
 type: eebus
 ski: {{ .ski }}
 {{ if .ip }}ip: {{ .ip }}{{ end }}
diff --git a/util/templates/includes/switchsocket.tpl b/util/templates/includes/switchsocket.tpl
index 4d29228be..7f3419434 100644
--- a/util/templates/includes/switchsocket.tpl
+++ b/util/templates/includes/switchsocket.tpl
@@ -1,5 +1,5 @@
 {{ define "switchsocket" }}
 standbypower: {{ .standbypower }}
-{{ if eq .integrateddevice "true" }}features: ["integrateddevice"]{{ end }}
+{{ if .integrateddevice }}features: ["integrateddevice"]{{ end }}
 {{ if .icon }}icon: {{ .icon }}{{ end }}
 {{ end -}}
diff --git a/util/templates/includes/vehicle-identify.tpl b/util/templates/includes/vehicle-identify.tpl
index e67f454db..6ae117009 100644
--- a/util/templates/includes/vehicle-identify.tpl
+++ b/util/templates/includes/vehicle-identify.tpl
@@ -22,8 +22,8 @@ onIdentify:
 {{- end }}
 {{- if len .identifiers }}
 identifiers:
-{{-   range .identifiers }}
+{{- range .identifiers }}
 - {{ . }}
-{{-   end }}
+{{- end }}
 {{- end }}
 {{- end }}