diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml
index 2512968477..2cd1858a63 100644
--- a/templates/definition/meter/fronius-gen24.yaml
+++ b/templates/definition/meter/fronius-gen24.yaml
@@ -20,21 +20,72 @@ params:
     advanced: true
   - name: maxacpower
 render: |
-  # reference: https://github.com/volkszaehler/mbmd/blob/master/meters/sunspec/models.go
+  type: custom
+  # sunspec model 203 (int+sf)/ 213 (float) meter
   {{- if eq .usage "grid" }}
-  type: mbmd
-  uri: {{ .host }}:{{ .port }}
-  id: 200
-  model: sunspec
-  power: Power
-  energy: Import
-  currents: # currents are signed already
-    - CurrentL1
-    - CurrentL2
-    - CurrentL3
+  power:
+    source: sunspec
+    uri: {{ .host }}:{{ .port }}
+    value: 
+      - 203:W
+      - 213:W
+  energy:
+    source: sunspec
+    uri: {{ .host }}:{{ .port }}
+    value: 
+      - 203:TotWhImp
+      - 213:TotWhImp
+    scale: 0.001
+  currents:
+    - source: sunspec
+      uri: {{ .host }}:{{ .port }}
+      value: 
+        - 203:AphA
+        - 213:AphA
+    - source: sunspec
+      uri: {{ .host }}:{{ .port }}
+      value: 
+        - 203:AphB
+        - 213:AphB
+    - source: sunspec
+      uri: {{ .host }}:{{ .port }}
+      value: 
+        - 203:AphC
+        - 213:AphC
+  voltages:
+    - source: sunspec
+      uri: {{ .host }}:{{ .port }}
+      value: 
+        - 203:PhVphA
+        - 213:PhVphA
+    - source: sunspec
+      uri: {{ .host }}:{{ .port }}
+      value: 
+        - 203:PhVphB
+        - 213:PhVphB
+    - source: sunspec
+      uri: {{ .host }}:{{ .port }}
+      value: 
+        - 203:PhVphC
+        - 213:PhVphC
+  powers:
+    - source: sunspec
+      uri: {{ .host }}:{{ .port }}
+      value: 
+        - 203:WphA
+        - 213:WphA
+    - source: sunspec
+      uri: {{ .host }}:{{ .port }}
+      value: 
+        - 203:WphB
+        - 213:WphB
+    - source: sunspec
+      uri: {{ .host }}:{{ .port }}
+      value: 
+        - 203:WphC
+        - 213:WphC
   {{- end }}
   {{- if eq .usage "pv" }}
-  type: custom
   power:
     source: calc
     add:
@@ -49,7 +100,6 @@ render: |
   maxacpower: {{ .maxacpower }} # W
   {{- end }}
   {{- if eq .usage "battery" }}
-  type: custom
   power:
     source: calc
     add: