diff --git a/templates/definition/meter/fronius-gen24.yaml b/templates/definition/meter/fronius-gen24.yaml
index 853a12290..e858090a0 100644
--- a/templates/definition/meter/fronius-gen24.yaml
+++ b/templates/definition/meter/fronius-gen24.yaml
@@ -3,6 +3,9 @@ products:
   - brand: Fronius
     description:
       generic: Symo GEN24 Plus
+  - brand: Fronius
+    description:
+      generic: Primo GEN24 Plus
 guidedsetup:
   enable: true
 params:
@@ -11,15 +14,6 @@ params:
   - name: host
   - name: port
     default: 502
-  - name: integer
-    description:
-      de: Integer Registerzugriff (nur für Netzzähler)
-      en: Integer register access (grid meter only)
-    help:
-      de: Einstellung Float/Integer im Wechselrichter überprüfen
-      en: Verify Float/Integer setting in inverter
-    advanced: true
-    valuetype: bool
 render: |
   # reference: https://github.com/volkszaehler/mbmd/blob/master/meters/sunspec/models.go
   {{- if eq .usage "grid" }}
@@ -27,21 +21,12 @@ render: |
   uri: {{ .host }}:{{ .port }}
   id: 200
   model: sunspec
-  {{- if eq .integer "true" }}
-  # sunspec model 203 (int+sf) meter
-  power: 203:W
+  power: Power
+  energy: Export
   currents:
-    - 203:AphA
-    - 203:AphB
-    - 203:AphC
-  {{ else }}
-  # sunspec model 213 (float) meter
-  power: 213:W
-  currents:
-    - 213:AphA
-    - 213:AphB
-    - 213:AphC
-  {{- end }}
+    - CurrentL1
+    - CurrentL2
+    - CurrentL3
   {{- end }}
   {{- if eq .usage "pv" }}
   type: custom
@@ -58,6 +43,12 @@ render: |
       id: 1
       model: sunspec
       value: 160:2:DCW # mppt 2
+  energy:
+    source: modbus
+    uri: {{ .host }}:{{ .port }}
+    id: 1
+    model: sunspec
+    value: Export
   {{- end }}
   {{- if eq .usage "battery" }}
   type: custom
diff --git a/templates/docs/meter/fronius-gen24_0.yaml b/templates/docs/meter/fronius-gen24_0.yaml
index 0bb0455d7..ca03690f5 100644
--- a/templates/docs/meter/fronius-gen24_0.yaml
+++ b/templates/docs/meter/fronius-gen24_0.yaml
@@ -9,13 +9,6 @@ render:
       usage: grid
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-    advanced: |
-      type: template
-      template: fronius-gen24
-      usage: grid
-      host: 192.0.2.2 # IP-Adresse oder Hostname
-      port: 502 # Port # Optional
-      integer: # Einstellung Float/Integer im Wechselrichter überprüfen # Optional
   - usage: pv
     default: |
       type: template
@@ -23,13 +16,6 @@ render:
       usage: pv
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-    advanced: |
-      type: template
-      template: fronius-gen24
-      usage: pv
-      host: 192.0.2.2 # IP-Adresse oder Hostname
-      port: 502 # Port # Optional
-      integer: # Einstellung Float/Integer im Wechselrichter überprüfen # Optional
   - usage: battery
     default: |
       type: template
@@ -37,10 +23,3 @@ render:
       usage: battery
       host: 192.0.2.2 # IP-Adresse oder Hostname
       port: 502 # Port # Optional
-    advanced: |
-      type: template
-      template: fronius-gen24
-      usage: battery
-      host: 192.0.2.2 # IP-Adresse oder Hostname
-      port: 502 # Port # Optional
-      integer: # Einstellung Float/Integer im Wechselrichter überprüfen # Optional
diff --git a/templates/docs/meter/fronius-gen24_1.yaml b/templates/docs/meter/fronius-gen24_1.yaml
new file mode 100644
index 000000000..93dd9ad15
--- /dev/null
+++ b/templates/docs/meter/fronius-gen24_1.yaml
@@ -0,0 +1,25 @@
+product:
+  brand: Fronius
+  description: Primo GEN24 Plus
+render:
+  - usage: grid
+    default: |
+      type: template
+      template: fronius-gen24
+      usage: grid
+      host: 192.0.2.2 # IP-Adresse oder Hostname
+      port: 502 # Port # Optional
+  - usage: pv
+    default: |
+      type: template
+      template: fronius-gen24
+      usage: pv
+      host: 192.0.2.2 # IP-Adresse oder Hostname
+      port: 502 # Port # Optional
+  - usage: battery
+    default: |
+      type: template
+      template: fronius-gen24
+      usage: battery
+      host: 192.0.2.2 # IP-Adresse oder Hostname
+      port: 502 # Port # Optional