diff --git a/templates/definition/meter/bosch-bpt.yaml b/templates/definition/meter/bosch-bpt.yaml
index 3b77178f4..037183f4c 100644
--- a/templates/definition/meter/bosch-bpt.yaml
+++ b/templates/definition/meter/bosch-bpt.yaml
@@ -16,4 +16,6 @@ render: |
   type: bosch-bpt
   usage: {{ .usage }}
   uri: {{ .uri }}
-  capacity: {{ .capacity }} # kWh
+  {{- if eq .usage "battery" }}
+  {{- include "battery-params" . }}
+  {{- end }}
diff --git a/templates/definition/meter/hager-flow-modbus.yaml b/templates/definition/meter/hager-flow-modbus.yaml
index 42ff8a376..903613276 100644
--- a/templates/definition/meter/hager-flow-modbus.yaml
+++ b/templates/definition/meter/hager-flow-modbus.yaml
@@ -87,5 +87,5 @@ render: |
       address: 4146 # Batterie-SOC in %
       type: holding
       decode: uint16
-  capacity: {{ .capacity }} # Nutzbare Kapazität in kWh | Net capacity (kWh)
+  {{- include "battery-params" . }}
   {{- end }}
diff --git a/templates/definition/meter/sma-inverter-speedwire.yaml b/templates/definition/meter/sma-inverter-speedwire.yaml
index bdcfa8fb9..79ebe9829 100644
--- a/templates/definition/meter/sma-inverter-speedwire.yaml
+++ b/templates/definition/meter/sma-inverter-speedwire.yaml
@@ -20,7 +20,7 @@ params:
 render: |
   type: sma
   uri: {{ .host }} # IP address or hostname
-  {{- if .password }}
   password: {{ .password }} # optional
+  {{- if eq .usage "battery" }}
+  {{- include "battery-params" . }}
   {{- end }}
-  capacity: {{ .capacity }} # kWh