diff --git a/templates/definition/meter/goodwe-hybrid.yaml b/templates/definition/meter/goodwe-hybrid.yaml
index 4189506fbb..1c69d86d00 100644
--- a/templates/definition/meter/goodwe-hybrid.yaml
+++ b/templates/definition/meter/goodwe-hybrid.yaml
@@ -34,37 +34,17 @@ render: |
   {{- end }}
   {{- if eq .usage "pv" }}
   power:
-    source: calc
-    add:
-    - source: modbus
-      {{- include "modbus" . | indent 4 }}
-      register: # manual non-sunspec register configuration
-        address: 35105 # Ppv1 PV1 Power
-        type: holding
-        decode: uint32nan
-    - source: modbus
-      {{- include "modbus" . | indent 4 }}
-      register: # manual non-sunspec register configuration
-        address: 35109 # Ppv2 PV2 Power
-        type: holding
-        decode: uint32nan
-    - source: modbus
-      {{- include "modbus" . | indent 4 }}
-      register: # manual non-sunspec register configuration
-        address: 35113 # Ppv3 PV3 Power
-        type: holding
-        decode: uint32nan
-    - source: modbus
-      {{- include "modbus" . | indent 4 }}
-      register: # manual non-sunspec register configuration
-        address: 35117 # Ppv4 PV4 Power
-        type: holding
-        decode: uint32nan
+    source: modbus
+    {{- include "modbus" . | indent 2 }}
+    register: # manual non-sunspec register configuration
+      address: 35301 # PV Total Power
+      type: holding
+      decode: uint32nan
   energy:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register: # manual non-sunspec register configuration
-      address: 35191 # PV E-Total Total PV Energy
+      address: 35191 # PV Energy-Total
       type: holding
       decode: uint32
     scale: 0.1
@@ -74,21 +54,21 @@ render: |
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register: # manual non-sunspec register configuration
-      address: 35183 # Pbattery1 First group battery power
+      address: 35182 # Battery1 Power
       type: holding
-      decode: int16
+      decode: int32
   soc:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register: # manual non-sunspec register configuration
-      address: 37007 # SOC First group battery capacity
+      address: 37007 # SOC
       type: holding
       decode: uint16
   energy:
     source: modbus
     {{- include "modbus" . | indent 2 }}
     register: # manual non-sunspec register configuration
-      address: 35209 # E-BatteryDischarge Discharge energy
+      address: 35209 # Energy-Battery Discharge
       type: holding
       decode: uint32
     scale: 0.1