diff --git a/templates/definition/meter/kostal-plenticore-gen2.yaml b/templates/definition/meter/kostal-plenticore-gen2.yaml
index 49a9afa61..139eef714 100644
--- a/templates/definition/meter/kostal-plenticore-gen2.yaml
+++ b/templates/definition/meter/kostal-plenticore-gen2.yaml
@@ -66,10 +66,20 @@ render: |
       {{- include "modbus" . | indent 4 }}
       value: 160:3:DCW # string 3
   energy:
-    source: sunspec
-    {{- include "modbus" . | indent 2 }}
-    value: 103:WH # total yield
-    scale: 0.001
+    source: calc
+    add:
+    - source: sunspec
+      {{- include "modbus" . | indent 4 }}
+      value: 160:1:DCWH # string 1
+      scale: 0.001
+    - source: sunspec
+      {{- include "modbus" . | indent 4 }}
+      value: 160:2:DCWH # string 2
+      scale: 0.001
+    - source: sunspec
+      {{- include "modbus" . | indent 4 }}
+      value: 160:3:DCWH # string 3
+      scale: 0.001
   maxacpower: {{ .maxacpower }} # W
   {{- end }}
   {{- if eq .usage "battery" }}
diff --git a/templates/definition/meter/kostal-plenticore.yaml b/templates/definition/meter/kostal-plenticore.yaml
index 7fbe96fef..85c5afa84 100644
--- a/templates/definition/meter/kostal-plenticore.yaml
+++ b/templates/definition/meter/kostal-plenticore.yaml
@@ -60,10 +60,20 @@ render: |
       {{- include "modbus" . | indent 4 }}
       value: 160:3:DCW # string 3
   energy:
-    source: sunspec
-    {{- include "modbus" . | indent 2 }}
-    value: 103:WH # total yield
-    scale: 0.001
+    source: calc
+    add:
+    - source: sunspec
+      {{- include "modbus" . | indent 4 }}
+      value: 160:1:DCWH # string 1
+      scale: 0.001
+    - source: sunspec
+      {{- include "modbus" . | indent 4 }}
+      value: 160:2:DCWH # string 2
+      scale: 0.001
+    - source: sunspec
+      {{- include "modbus" . | indent 4 }}
+      value: 160:3:DCWH # string 3
+      scale: 0.001
   maxacpower: {{ .maxacpower }} # W
   {{- end }}
   {{- if eq .usage "battery" }}
diff --git a/templates/definition/meter/solaredge-hybrid.yaml b/templates/definition/meter/solaredge-hybrid.yaml
index d444c6cb3..ec1a79169 100644
--- a/templates/definition/meter/solaredge-hybrid.yaml
+++ b/templates/definition/meter/solaredge-hybrid.yaml
@@ -102,13 +102,6 @@ render: |
           address: 62836 # Battery 1 Instantaneous Power
           type: holding
           decode: float32nans
-  energy:
-    source: sunspec
-    {{- include "modbus" . | indent 2 }}
-    value:
-      - 101:WH
-      - 103:WH
-    scale: 0.001
   maxacpower: {{ .maxacpower }} # W
   {{- end }}
   {{- if eq .usage "battery" }}