diff --git a/src/sunsynk/definitions3phhv.py b/src/sunsynk/definitions3phhv.py
index 87494899..cc3e604b 100644
--- a/src/sunsynk/definitions3phhv.py
+++ b/src/sunsynk/definitions3phhv.py
@@ -24,9 +24,7 @@
 # Battery
 ##########
 SENSORS += (
-    Sensor(
-        586, "Battery 1 temperature", CELSIUS, 0.1
-    ),  # this one seems to not follow the convention of other temperatures. 290 = 29c
+    TempSensor(586, "Battery 1 temperature", CELSIUS, 0.1),
     Sensor(587, "Battery 1 voltage", VOLT, 0.1),
     Sensor(588, "Battery 1 SOC", "%"),
     Sensor(590, "Battery 1 power", WATT, -10),
@@ -35,9 +33,7 @@
     Sensor(593, "Battery 2 voltage", VOLT, 0.1),
     Sensor(594, "Battery 2 current", AMPS, -0.01),
     Sensor(595, "Battery 2 power", WATT, -10),
-    Sensor(
-        596, "Battery 2 temperature", CELSIUS, 0.1
-    ),  # this one seems to not follow the convention of other temperatures. 290 = 29c
+    TempSensor(596, "Battery 2 temperature", CELSIUS, 0.1),
 )
 
 #############
diff --git a/src/tests/sunsynk/migration/old_hv.py b/src/tests/sunsynk/migration/old_hv.py
index 1d38f7cb..c0e3c60d 100644
--- a/src/tests/sunsynk/migration/old_hv.py
+++ b/src/tests/sunsynk/migration/old_hv.py
@@ -28,9 +28,7 @@
 # Battery
 ##########
 SENSORS += (
-    Sensor(
-        586, "Battery 1 temperature", CELSIUS, 0.1
-    ),  # this one seems to not follow the convention of other temperatures. 290 = 29c
+    TempSensor(586, "Battery 1 temperature", CELSIUS, 0.1),
     Sensor(587, "Battery 1 voltage", VOLT, 0.1),
     Sensor(588, "Battery 1 SOC", "%"),
     Sensor(590, "Battery 1 power", WATT, -10),
@@ -39,9 +37,7 @@
     Sensor(593, "Battery 2 voltage", VOLT, 0.1),
     Sensor(594, "Battery 2 current", AMPS, -0.01),
     Sensor(595, "Battery 2 power", WATT, -10),
-    Sensor(
-        596, "Battery 2 temperature", CELSIUS, 0.1
-    ),  # this one seems to not follow the convention of other temperatures. 290 = 29c
+    TempSensor(596, "Battery 2 temperature", CELSIUS, 0.1),
 )
 
 #################
@@ -245,14 +241,14 @@
 # Settings
 ###########
 SENSORS += (
-    NumberRWSensor(128, "Grid Charge Battery current", AMPS, max=210),
+    NumberRWSensor(128, "Grid Charge Battery current", AMPS, max=240),
     SwitchRWSensor(130, "Grid Charge enabled"),
     NumberRWSensor(127, "Grid Charge Start Battery SOC", "%"),
     SwitchRWSensor(146, "Use Timer", on=255),
     SwitchRWSensor(145, "Solar Export"),
     NumberRWSensor(143, "Export Limit power", WATT, max=RATED_POWER),
-    NumberRWSensor(108, "Battery Max Charge current", AMPS, max=210),
-    NumberRWSensor(109, "Battery Max Discharge current", AMPS, max=210),
+    NumberRWSensor(108, "Battery Max Charge current", AMPS, max=240),
+    NumberRWSensor(109, "Battery Max Discharge current", AMPS, max=240),
     NumberRWSensor(102, "Battery Capacity current", "Ah", max=2000),
     NumberRWSensor(191, "Grid Peak Shaving power", WATT, 10, max=100000),
 )
diff --git a/src/tests/sunsynk/migration/old_lv.py b/src/tests/sunsynk/migration/old_lv.py
index a3089ceb..b2303ecb 100644
--- a/src/tests/sunsynk/migration/old_lv.py
+++ b/src/tests/sunsynk/migration/old_lv.py
@@ -167,13 +167,13 @@
 # Settings
 ###########
 SENSORS += (
-    NumberRWSensor(128, "Grid Charge Battery current", AMPS, max=210),
+    NumberRWSensor(128, "Grid Charge Battery current", AMPS, max=240),
     SwitchRWSensor(130, "Grid Charge enabled"),
     SwitchRWSensor(146, "Use Timer", on=255),
     SwitchRWSensor(145, "Solar Export"),
     NumberRWSensor(143, "Export Limit power", WATT, max=RATED_POWER),
-    NumberRWSensor(108, "Battery Max Charge current", AMPS, max=210),
-    NumberRWSensor(109, "Battery Max Discharge current", AMPS, max=210),
+    NumberRWSensor(108, "Battery Max Charge current", AMPS, max=240),
+    NumberRWSensor(109, "Battery Max Discharge current", AMPS, max=240),
     NumberRWSensor(102, "Battery Capacity current", AMPS, max=2000),
     NumberRWSensor(191, "Grid Peak Shaving power", WATT, max=100000),
 )