diff --git a/packages/base.yaml b/packages/base.yaml
index 4529a40cc6a520be004e1fe9d33cd3feff04c281..b35eabd24aa9ba5a688e57b054f3cea01c5b3f70 100644
--- a/packages/base.yaml
+++ b/packages/base.yaml
@@ -31,7 +31,8 @@ ota:
 wifi:
   ssid: !secret wifi_ssid
   password: !secret wifi_password
-  fast_connect: on
+  #fast_connect: on
+  reboot_timeout: 1min
   use_address: ${devicename}.${domain}
   ap:
     ssid: "$devicename Fallback Hotspot"
diff --git a/packages/esp32.yaml b/packages/esp32.yaml
index 8a9169d0aad0faf59cdb04625167224526a8d9c8..c6a8de17e2d44fbf750656b9a7e76746eb095978 100644
--- a/packages/esp32.yaml
+++ b/packages/esp32.yaml
@@ -5,3 +5,6 @@ i2c:
   sda: 21
   scl: 22
   frequency: 10khz
+
+wifi:
+  power_save_mode: none
diff --git a/packages/light.yaml b/packages/light.yaml
index a0204a0bb8d863e3aeb6413505b46a2d6937d159..85cfb750ab8ad17b9d25cd5e1aa4d8fb6518ed7d 100644
--- a/packages/light.yaml
+++ b/packages/light.yaml
@@ -1,13 +1,9 @@
 substitutions:
   # Schedules
-  #schedule_grow_on: "0 0 3 * * *"
-  #schedule_grow_off: "0 0 21 * * *"
-  #schedule_bloom_on: "0 0 6 * * *"
-  #schedule_bloom_off: "0 0 18 * * *"
-  schedule_grow_on: "5,15,25,35,45,55 * * * * *"
-  schedule_grow_off: "0,10,20,30,40,50 * * * * *"
-  schedule_bloom_on: "0 * * * * *"
-  schedule_bloom_off: "30 * * * * *"
+  schedule_grow_on: "0 0 3 * * *"
+  schedule_grow_off: "0 0 21 * * *"
+  schedule_bloom_on: "0 0 6 * * *"
+  schedule_bloom_off: "0 0 18 * * *"
 
 prometheus:
   relabel:
diff --git a/packages/scd40.yaml b/packages/scd40.yaml
index b3ef0384fb86bf434efa44814127431bf1890a75..dfd9ebb73d8a9a25925597ea0b386b7a8b292a01 100644
--- a/packages/scd40.yaml
+++ b/packages/scd40.yaml
@@ -1,7 +1,7 @@
 sensor:
 - platform: scd4x
   update_interval: 5s
-  temperature_offset: 4.85
+  temperature_offset: 4.35
   ambient_pressure_compensation_source: bme280_pressure
   co2:
     id: scd40_co2