diff --git a/templates/definition/meter/ecoflow-powerocean.yaml b/templates/definition/meter/ecoflow-powerocean.yaml
index d914bb6a6..1fa102169 100644
--- a/templates/definition/meter/ecoflow-powerocean.yaml
+++ b/templates/definition/meter/ecoflow-powerocean.yaml
@@ -56,7 +56,7 @@ render: |
   type: ecoflow
   accesskey: {{ .accesskey }}
   secretkey: {{ .secretkey }}
-  serial: {{ if .serial }}{{ .serial }}{{ else }}{{ .deviceid }}{{ end }}
+  serial: {{ or .serial .deviceid }}
   usage: {{ .usage }}
   region: {{ .region }}
   cache: {{ .cache }}
diff --git a/templates/definition/meter/ecoflow-stream.yaml b/templates/definition/meter/ecoflow-stream.yaml
index f6056c30e..65b886318 100644
--- a/templates/definition/meter/ecoflow-stream.yaml
+++ b/templates/definition/meter/ecoflow-stream.yaml
@@ -57,7 +57,7 @@ render: |
   type: ecoflow
   accesskey: {{ .accesskey }}
   secretkey: {{ .secretkey }}
-  serial: {{ if .serial }}{{ .serial }}{{ else }}{{ .deviceid }}{{ end }}
+  serial: {{ or .serial .deviceid }}
   usage: {{ .usage }}
   cache: {{ .cache }}
   region: {{ .region }}
diff --git a/templates/definition/meter/goodwe-wifi-es.yaml b/templates/definition/meter/goodwe-wifi-es.yaml
index 056b36a9c..e7eb69805 100644
--- a/templates/definition/meter/goodwe-wifi-es.yaml
+++ b/templates/definition/meter/goodwe-wifi-es.yaml
@@ -16,7 +16,7 @@ render: |
   {{- if eq .usage "grid" }}
   power:
     source: aa55udp
-    host: {{ if .host }}{{ .host }}{{ else }}{{ .uri }}{{ end }}
+    host: {{ or .host .uri }}
     register: 29964
     count: 2
     decode: int32be
@@ -24,7 +24,7 @@ render: |
   {{- if eq .usage "pv" }}
   power:
     source: aa55udp
-    host: {{ if .host }}{{ .host }}{{ else }}{{ .uri }}{{ end }}
+    host: {{ or .host .uri }}
     register: 29958
     count: 2
     decode: int32be
@@ -32,13 +32,13 @@ render: |
   {{- if eq .usage "battery" }}
   power:
     source: aa55udp
-    host: {{ if .host }}{{ .host }}{{ else }}{{ .uri }}{{ end }}
+    host: {{ or .host .uri }}
     register: 29970
     count: 2
     decode: int32be
   soc:
     source: aa55udp
-    host: {{ if .host }}{{ .host }}{{ else }}{{ .uri }}{{ end }}
+    host: {{ or .host .uri }}
     register: 29966
     count: 1
     decode: uint16be
diff --git a/templates/definition/meter/goodwe-wifi.yaml b/templates/definition/meter/goodwe-wifi.yaml
index 3bd8eab9b..b2d4f0c66 100644
--- a/templates/definition/meter/goodwe-wifi.yaml
+++ b/templates/definition/meter/goodwe-wifi.yaml
@@ -16,4 +16,4 @@ params:
 render: |
   type: goodwe-wifi
   usage: {{ .usage }}
-  uri: {{ if .host }}{{ .host }}{{ else }}{{ .uri }}{{ end }}
+  uri: {{ or .host .uri }}
diff --git a/templates/definition/meter/sonnenbatterie_eco56.yaml b/templates/definition/meter/sonnenbatterie_eco56.yaml
index a3829cbfb..03033abd4 100644
--- a/templates/definition/meter/sonnenbatterie_eco56.yaml
+++ b/templates/definition/meter/sonnenbatterie_eco56.yaml
@@ -115,6 +115,6 @@ render: |
                   - source: http
                     method: PUT
                     uri: http://{{ .host }}:{{ .port }}/rest/devices/battery/C24
-                    body: {{ if .maxchargepower }}{{ .maxchargepower }}{{ else }}99000{{ end }}
+                    body: {{ or .maxchargepower 99000 }}
   {{- include "battery-params" . }}
   {{- end }}