diff --git a/esphome-beta/CHANGELOG.md b/esphome-beta/CHANGELOG.md
index ced522b..7a27562 100644
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1,12 +1,9 @@
-## 2025.10.4
+## 2025.10.5
 
 [**Read release announcement**](https://beta.esphome.io/changelog/2025.10.0)
 
-- [uart] Fix order of initialization calls [esphome#11510](https://github.com/esphome/esphome/pull/11510) by [@kbx81](https://github.com/kbx81)
-- Fix the LiberTiny bug with UART pin setup [esphome#11518](https://github.com/esphome/esphome/pull/11518) by [@asergunov](https://github.com/asergunov)
-- [mipi_rgb] Fix rotation with custom model [esphome#11585](https://github.com/esphome/esphome/pull/11585) by [@clydebarrow](https://github.com/clydebarrow) (new-feature)
-- [lvgl] Fix nested lambdas in automations unable to access parameters [esphome#11583](https://github.com/esphome/esphome/pull/11583) by [@bdraco](https://github.com/bdraco)
-- [image] Catch and report svg load errors [esphome#11619](https://github.com/esphome/esphome/pull/11619) by [@clydebarrow](https://github.com/clydebarrow)
-- [lvgl] Fix event for binary sensor [esphome#11636](https://github.com/esphome/esphome/pull/11636) by [@clydebarrow](https://github.com/clydebarrow)
-- [sdl] Fix keymappings [esphome#11635](https://github.com/esphome/esphome/pull/11635) by [@clydebarrow](https://github.com/clydebarrow)
+- [const] Add CONF_ROWS [esphome#11249](https://github.com/esphome/esphome/pull/11249) by [@stuartparmenter](https://github.com/stuartparmenter)
+- [core] Don't allow python 3.14 [esphome#11527](https://github.com/esphome/esphome/pull/11527) by [@swoboda1337](https://github.com/swoboda1337)
+- [usb_uart] Fixes for transfer queue allocation [esphome#11548](https://github.com/esphome/esphome/pull/11548) by [@clydebarrow](https://github.com/clydebarrow)
+- [lvgl] Fix rotation with unusual width [esphome#11680](https://github.com/esphome/esphome/pull/11680) by [@clydebarrow](https://github.com/clydebarrow)
 
diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index 2fd94b9..1c938e5 100644
--- a/esphome-beta/config.yaml
+++ b/esphome-beta/config.yaml
@@ -32,7 +32,7 @@ init: false
 startup: services
 name: ESPHome Device Builder (beta)
 panel_title: ESPHome Builder (beta)
-version: 2025.10.4
+version: 2025.10.5
 slug: esphome-beta
 description: Beta version of ESPHome Device Builder
 image: ghcr.io/esphome/esphome-hassio
diff --git a/esphome/CHANGELOG.md b/esphome/CHANGELOG.md
index 013fc7c..aef0010 100644
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1,12 +1,9 @@
-## 2025.10.4
+## 2025.10.5
 
 [**Read release announcement**](https://esphome.io/changelog/2025.10.0)
 
-- [uart] Fix order of initialization calls [esphome#11510](https://github.com/esphome/esphome/pull/11510) by [@kbx81](https://github.com/kbx81)
-- Fix the LiberTiny bug with UART pin setup [esphome#11518](https://github.com/esphome/esphome/pull/11518) by [@asergunov](https://github.com/asergunov)
-- [mipi_rgb] Fix rotation with custom model [esphome#11585](https://github.com/esphome/esphome/pull/11585) by [@clydebarrow](https://github.com/clydebarrow) (new-feature)
-- [lvgl] Fix nested lambdas in automations unable to access parameters [esphome#11583](https://github.com/esphome/esphome/pull/11583) by [@bdraco](https://github.com/bdraco)
-- [image] Catch and report svg load errors [esphome#11619](https://github.com/esphome/esphome/pull/11619) by [@clydebarrow](https://github.com/clydebarrow)
-- [lvgl] Fix event for binary sensor [esphome#11636](https://github.com/esphome/esphome/pull/11636) by [@clydebarrow](https://github.com/clydebarrow)
-- [sdl] Fix keymappings [esphome#11635](https://github.com/esphome/esphome/pull/11635) by [@clydebarrow](https://github.com/clydebarrow)
+- [const] Add CONF_ROWS [esphome#11249](https://github.com/esphome/esphome/pull/11249) by [@stuartparmenter](https://github.com/stuartparmenter)
+- [core] Don't allow python 3.14 [esphome#11527](https://github.com/esphome/esphome/pull/11527) by [@swoboda1337](https://github.com/swoboda1337)
+- [usb_uart] Fixes for transfer queue allocation [esphome#11548](https://github.com/esphome/esphome/pull/11548) by [@clydebarrow](https://github.com/clydebarrow)
+- [lvgl] Fix rotation with unusual width [esphome#11680](https://github.com/esphome/esphome/pull/11680) by [@clydebarrow](https://github.com/clydebarrow)
 
diff --git a/esphome/config.yaml b/esphome/config.yaml
index fcafd19..f7b1b86 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,7 +32,7 @@ init: false
 startup: services
 name: ESPHome Device Builder
 panel_title: ESPHome Builder
-version: 2025.10.4
+version: 2025.10.5
 slug: esphome
 description: Build your own smart home devices using ESPHome, no programming experience
   required
diff --git a/template/addon_config.yaml b/template/addon_config.yaml
index 446daca..cb1e075 100644
--- a/template/addon_config.yaml
+++ b/template/addon_config.yaml
@@ -71,7 +71,7 @@ esphome-beta:
   directory: esphome-beta
   name: ESPHome Device Builder (beta)
   panel_title: ESPHome Builder (beta)
-  version: "2025.10.4"  # BETA
+  version: "2025.10.5"  # BETA
   slug: esphome-beta
   description: "Beta version of ESPHome Device Builder"
   url: https://beta.esphome.io/
@@ -86,7 +86,7 @@ esphome-stable:
   directory: esphome
   name: ESPHome Device Builder
   panel_title: ESPHome Builder
-  version: "2025.10.4"  # STABLE
+  version: "2025.10.5"  # STABLE
   slug: esphome
   description: "Build your own smart home devices using ESPHome, no programming experience required"
   image: ghcr.io/esphome/esphome-hassio