diff --git a/apps/predbat/config.py b/apps/predbat/config.py
index 8c0b9a185..b18719d0b 100644
--- a/apps/predbat/config.py
+++ b/apps/predbat/config.py
@@ -1774,13 +1774,13 @@
         "output_charge_control": "none",
         "charge_control_immediate": False,
         "current_dp": 0,
-        "has_charge_enable_time": False,
-        "has_discharge_enable_time": False,
-        "has_target_soc": False,
-        "has_reserve_soc": False,
+        "has_charge_enable_time": True,
+        "has_discharge_enable_time": True,
+        "has_target_soc": True,
+        "has_reserve_soc": True,
         "has_timed_pause": False,
-        "charge_time_format": "S",
-        "charge_time_entity_is_option": False,
+        "charge_time_format": "HH:MM:SS",
+        "charge_time_entity_is_option": True,
         "soc_units": "%",
         "num_load_entities": 1,
         "has_ge_inverter_mode": False,
@@ -1793,7 +1793,7 @@
         "has_idle_time": False,
         "can_span_midnight": False,
         "charge_discharge_with_rate": False,
-        "target_soc_used_for_discharge": True,
+        "target_soc_used_for_discharge": False,
     },
     "SIG": {
         "name": "Sigenergy Sigenstor",
diff --git a/templates/solar_assistant_growatt_spa.yaml b/templates/solar_assistant_growatt_spa.yaml
index 3baea6b09..07738bd9f 100644
--- a/templates/solar_assistant_growatt_spa.yaml
+++ b/templates/solar_assistant_growatt_spa.yaml
@@ -50,12 +50,8 @@ pred_bat:
     - sensor.growatt_spa_pv_energy
   battery_voltage:
     - sensor.growatt_spa_battery_voltage
-
-  # This is disabled by default in the Solax integration so it must be manually enabled.
   inverter_time:
     - sensor.date_time
-
-  # This is disabled by default in the Solax integration so it must be manually enabled.
   battery_power:
     - sensor.growatt_spa_battery_power
   pv_power:
@@ -63,15 +59,13 @@ pred_bat:
   soc_percent:
     - sensor.growatt_spa_battery_state_of_charge
 
-#  reserve:
-#    - number.growatt_spa_grid_first_stop_discharge
+  reserve:
+    - number.growatt_spa_load_first_stop_discharge
+    - number.growatt_spa_grid_first_stop_discharge
 
   battery_min_soc:
     - number.growatt_spa_grid_first_stop_discharge
 
-#  energy_control_switch:
-    - select.growatt_spa_work_mode_priority
-
   # Service for start/stop
   charge_start_service:
     service: select.select_option
@@ -86,6 +80,22 @@ pred_bat:
     entity_id: select.growatt_spa_work_mode_priority
     option: "Grid first"
 
+  charge_start_time:
+    - select.growatt_spa_battery_first_slot_1_start
+  charge_end_time:
+    - select.growatt_spa_battery_first_slot_1_end
+  charge_limit:
+    - number.growatt_spa_battery_first_stop_charge
+  scheduled_charge_enable:
+    - switch.growatt_spa_battery_first_slot_1_enabled
+
+  discharge_start_time:
+    - select.growatt_spa_grid_first_slot_1_start
+  discharge_end_time:
+    - select.growatt_spa_grid_first_slot_1_end
+  scheduled_discharge_enable:
+    - switch.growatt_spa_grid_first_slot_1_enabled
+
   # Inverter max AC limit (one per inverter)
   # If you have a second inverter for PV only please add the two values together
   inverter_limit: 3245
diff --git a/templates/solar_assistant_growatt_sph.yaml b/templates/solar_assistant_growatt_sph.yaml
index 0cb225ba4..7e97dfd4d 100644
--- a/templates/solar_assistant_growatt_sph.yaml
+++ b/templates/solar_assistant_growatt_sph.yaml
@@ -50,8 +50,6 @@ pred_bat:
     - sensor.growatt_sph_pv_energy
   battery_voltage:
     - sensor.growatt_sph_battery_voltage
-
-  # This is disabled by default in the Solax integration so it must be manually enabled.
   battery_power:
     - sensor.growatt_sph_battery_power
   pv_power:
@@ -60,14 +58,12 @@ pred_bat:
     - sensor.growatt_sph_battery_state_of_charge
 
   reserve:
+    - number.growatt_sph_load_first_stop_discharge
     - number.growatt_sph_grid_first_stop_discharge
 
   battery_min_soc:
     - number.growatt_sph_grid_first_stop_discharge
 
-    #  energy_control_switch:
-    - select.growatt_sph_work_mode_priority
-
   # Service for start/stop
   charge_start_service:
     service: select.select_option
@@ -82,6 +78,22 @@ pred_bat:
     entity_id: select.growatt_sph_work_mode_priority
     option: "Grid first"
 
+  charge_start_time:
+    - select.growatt_sph_battery_first_slot_1_start
+  charge_end_time:
+    - select.growatt_sph_battery_first_slot_1_end
+  charge_limit:
+    - number.growatt_sph_battery_first_stop_charge
+  scheduled_charge_enable:
+    - switch.growatt_sph_battery_first_slot_1_enabled
+
+  discharge_start_time:
+    - select.growatt_sph_grid_first_slot_1_start
+  discharge_end_time:
+    - select.growatt_sph_grid_first_slot_1_end
+  scheduled_discharge_enable:
+    - switch.growatt_sph_grid_first_slot_1_enabled
+
   # Inverter max AC limit (one per inverter)
   # If you have a second inverter for PV only please add the two values together
   inverter_limit: 3245