diff --git a/esphome-beta/CHANGELOG.md b/esphome-beta/CHANGELOG.md
index d2c5e87..4ef452b 100644
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1,11 +1,6 @@
-## 2023.12.6
+## 2023.12.7
 
-- Fix device not requesting Home Assistant time at the update interval [esphome#6022](https://github.com/esphome/esphome/pull/6022) by [@bdraco](https://github.com/bdraco)
-- fix compilation error for libretiny [esphome#6064](https://github.com/esphome/esphome/pull/6064) by [@tomaszduda23](https://github.com/tomaszduda23)
-- pylontech: Fix parsing error with US2000 [esphome#6061](https://github.com/esphome/esphome/pull/6061) by [@functionpointer](https://github.com/functionpointer)
-- Support full (>460 char) dumps of Pronto IR commands [esphome#6040](https://github.com/esphome/esphome/pull/6040) by [@rpaskowitz](https://github.com/rpaskowitz)
-- ESP32-C3 USB_CDC fixes [esphome#6069](https://github.com/esphome/esphome/pull/6069) by [@kbx81](https://github.com/kbx81)
-- Improv Serial -- don't wait for incoming bytes [esphome#6089](https://github.com/esphome/esphome/pull/6089) by [@kbx81](https://github.com/kbx81)
-- add STATE_CLASS_TOTAL_INCREASING to bl0940 and bl0942 [esphome#6090](https://github.com/esphome/esphome/pull/6090) by [@tomaszduda23](https://github.com/tomaszduda23)
-- Fallback to pure-python loader for better error when YAML loading fails [esphome#6081](https://github.com/esphome/esphome/pull/6081) by [@bdraco](https://github.com/bdraco)
+- Fix RMT timing clock base [esphome#6101](https://github.com/esphome/esphome/pull/6101) by [@majkrzak](https://github.com/majkrzak)
+- Create RingBuffer for VoiceAssistant [esphome#6102](https://github.com/esphome/esphome/pull/6102) by [@jesserockz](https://github.com/jesserockz)
+- Inkplate6: Fix crash with initial set of greyscale [esphome#6038](https://github.com/esphome/esphome/pull/6038) by [@clydebarrow](https://github.com/clydebarrow)
 
diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index 09b6657..cf37128 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.6
+version: 2023.12.7
 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 d2c5e87..4ef452b 100644
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1,11 +1,6 @@
-## 2023.12.6
+## 2023.12.7
 
-- Fix device not requesting Home Assistant time at the update interval [esphome#6022](https://github.com/esphome/esphome/pull/6022) by [@bdraco](https://github.com/bdraco)
-- fix compilation error for libretiny [esphome#6064](https://github.com/esphome/esphome/pull/6064) by [@tomaszduda23](https://github.com/tomaszduda23)
-- pylontech: Fix parsing error with US2000 [esphome#6061](https://github.com/esphome/esphome/pull/6061) by [@functionpointer](https://github.com/functionpointer)
-- Support full (>460 char) dumps of Pronto IR commands [esphome#6040](https://github.com/esphome/esphome/pull/6040) by [@rpaskowitz](https://github.com/rpaskowitz)
-- ESP32-C3 USB_CDC fixes [esphome#6069](https://github.com/esphome/esphome/pull/6069) by [@kbx81](https://github.com/kbx81)
-- Improv Serial -- don't wait for incoming bytes [esphome#6089](https://github.com/esphome/esphome/pull/6089) by [@kbx81](https://github.com/kbx81)
-- add STATE_CLASS_TOTAL_INCREASING to bl0940 and bl0942 [esphome#6090](https://github.com/esphome/esphome/pull/6090) by [@tomaszduda23](https://github.com/tomaszduda23)
-- Fallback to pure-python loader for better error when YAML loading fails [esphome#6081](https://github.com/esphome/esphome/pull/6081) by [@bdraco](https://github.com/bdraco)
+- Fix RMT timing clock base [esphome#6101](https://github.com/esphome/esphome/pull/6101) by [@majkrzak](https://github.com/majkrzak)
+- Create RingBuffer for VoiceAssistant [esphome#6102](https://github.com/esphome/esphome/pull/6102) by [@jesserockz](https://github.com/jesserockz)
+- Inkplate6: Fix crash with initial set of greyscale [esphome#6038](https://github.com/esphome/esphome/pull/6038) by [@clydebarrow](https://github.com/clydebarrow)
 
diff --git a/esphome/config.yaml b/esphome/config.yaml
index 02b6e6c..49e723d 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 init: false
 startup: services
 name: ESPHome
-version: 2023.12.6
+version: 2023.12.7
 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 87f9428..35be317 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.6'  # BETA
+  version: '2023.12.7'  # 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.6'  # STABLE
+  version: '2023.12.7'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio