diff --git a/esphome-beta/CHANGELOG.md b/esphome-beta/CHANGELOG.md
index ba3bd27..eb44e06 100644
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1,4 +1,8 @@
-## 2023.12.1
+## 2023.12.2
 
-- Fix replaced - in allowed characters during object_id sanitizing [esphome#5983](https://github.com/esphome/esphome/pull/5983) by [@jesserockz](https://github.com/jesserockz)
+- ESP32-S3 and ESP-IDF don't play well with USB_CDC and need USB_SERIAL_JTAG [esphome#5929](https://github.com/esphome/esphome/pull/5929) by [@clydebarrow](https://github.com/clydebarrow)
+- Update libtiff6 [esphome#5985](https://github.com/esphome/esphome/pull/5985) by [@cvandesande](https://github.com/cvandesande)
+- Override GPIOs 12 and 13 on the airm2m (LuatOS) board  [esphome#5982](https://github.com/esphome/esphome/pull/5982) by [@davidmonro](https://github.com/davidmonro)
+- Add workaround for crash in Arduino 2.0.9 when CDC is configured [esphome#5987](https://github.com/esphome/esphome/pull/5987) by [@kbx81](https://github.com/kbx81)
+- web_server.py: return empty content when file doesn't exist [esphome#5980](https://github.com/esphome/esphome/pull/5980) by [@jessicah](https://github.com/jessicah)
 
diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index c5a79bb..fb477be 100644
--- a/esphome-beta/config.yaml
+++ b/esphome-beta/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 init: false
 startup: services
 name: ESPHome (beta)
-version: 2023.12.1
+version: 2023.12.2
 slug: esphome-beta
 description: Beta version of ESPHome add-on
 image: ghcr.io/esphome/esphome-hassio
diff --git a/esphome/CHANGELOG.md b/esphome/CHANGELOG.md
index ba3bd27..eb44e06 100644
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1,4 +1,8 @@
-## 2023.12.1
+## 2023.12.2
 
-- Fix replaced - in allowed characters during object_id sanitizing [esphome#5983](https://github.com/esphome/esphome/pull/5983) by [@jesserockz](https://github.com/jesserockz)
+- ESP32-S3 and ESP-IDF don't play well with USB_CDC and need USB_SERIAL_JTAG [esphome#5929](https://github.com/esphome/esphome/pull/5929) by [@clydebarrow](https://github.com/clydebarrow)
+- Update libtiff6 [esphome#5985](https://github.com/esphome/esphome/pull/5985) by [@cvandesande](https://github.com/cvandesande)
+- Override GPIOs 12 and 13 on the airm2m (LuatOS) board  [esphome#5982](https://github.com/esphome/esphome/pull/5982) by [@davidmonro](https://github.com/davidmonro)
+- Add workaround for crash in Arduino 2.0.9 when CDC is configured [esphome#5987](https://github.com/esphome/esphome/pull/5987) by [@kbx81](https://github.com/kbx81)
+- web_server.py: return empty content when file doesn't exist [esphome#5980](https://github.com/esphome/esphome/pull/5980) by [@jessicah](https://github.com/jessicah)
 
diff --git a/esphome/config.yaml b/esphome/config.yaml
index 1390c71..52e68f8 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 init: false
 startup: services
 name: ESPHome
-version: 2023.12.1
+version: 2023.12.2
 slug: esphome
 description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
 image: ghcr.io/esphome/esphome-hassio
diff --git a/template/addon_config.yaml b/template/addon_config.yaml
index 0644f01..f31c61a 100644
--- a/template/addon_config.yaml
+++ b/template/addon_config.yaml
@@ -70,7 +70,7 @@ esphome-beta:
   <<: *base
   directory: esphome-beta
   name: ESPHome (beta)
-  version: '2023.12.1'  # BETA
+  version: '2023.12.2'  # BETA
   slug: esphome-beta
   description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
@@ -84,7 +84,7 @@ esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: '2023.12.1'  # STABLE
+  version: '2023.12.2'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio