diff --git a/controllers.yaml b/controllers.yaml
index be07a9e..7917e03 100644
--- a/controllers.yaml
+++ b/controllers.yaml
@@ -2,8 +2,9 @@
 # Copyright (c) 2023 Ilia Sotnikov
 ---
 esphome:
-  # Required for proper resume handling
-  min_version: '2023.7.0'
+  # Required for proper resume handling and avoiding crash at startup when
+  # winter mode enabled
+  min_version: '2023.10.0'
 
 sprinkler:
   - id: lawn_sprinklers
@@ -194,6 +195,7 @@ switch:
   - platform: template
     id: winter_mode
     name: "Winter mode"
+    icon: "mdi:snowflake"
     optimistic: true
     restore_mode: RESTORE_DEFAULT_OFF
     entity_category: config
diff --git a/main.yaml b/main.yaml
index df0320d..f2d7c94 100644
--- a/main.yaml
+++ b/main.yaml
@@ -35,11 +35,6 @@ packages:
   time: !include time.yaml  # Optional
   rtc: !include rtc.yaml  # Optional
 
-# Both recent ESPHome version and PR below are needed to avoid crashing at
-# startup when winter mode enabled
+# 2023.10.0 addresses Pillow security vulnerability
 esphome:
-  min_version: 2023.9.3
-
-external_components:
-  - source: github://pr#5499
-    components: [sprinkler]
+  min_version: '2023.10.0'
diff --git a/requirements.txt b/requirements.txt
index d27ae91..1d4dfdb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-esphome>=2023.7.0
-pillow~=9.5
+esphome>=2023.10.0
+pillow==10.0.1