diff --git a/esphome-beta/CHANGELOG.md b/esphome-beta/CHANGELOG.md
index 5515591..7bed21a 100644
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1,10 +1,3 @@
-## 2024.6.3
-
-- [safe_mode] Set safe mode core data in disabled cases [esphome#6983](https://github.com/esphome/esphome/pull/6983) by [@jesserockz](https://github.com/jesserockz)
-- [ota-esphome] Validate for multiple esphome ota instances [esphome#6984](https://github.com/esphome/esphome/pull/6984) by [@kbx81](https://github.com/kbx81)
-- Improve 'body' handling in http_request on_response triggers [esphome#6968](https://github.com/esphome/esphome/pull/6968) by [@kpfleming](https://github.com/kpfleming)
-- [ds1307] Initialize uninitialized struct members [esphome#6985](https://github.com/esphome/esphome/pull/6985) by [@ptr727](https://github.com/ptr727)
-- Fix float encoding in modbus server [esphome#6986](https://github.com/esphome/esphome/pull/6986) by [@Petapton](https://github.com/Petapton)
-- [dallas_temp] fix ds18s20 temp calc [esphome#6988](https://github.com/esphome/esphome/pull/6988) by [@ssieb](https://github.com/ssieb)
-- [modbus-text-sensor] fix potential buffer overflow [esphome#6993](https://github.com/esphome/esphome/pull/6993) by [@dudanov](https://github.com/dudanov)
+## 2024.6.4
 
+- [ota-esphome] Merge configurations by port [esphome#7001](https://github.com/esphome/esphome/pull/7001) by [@kbx81](https://github.com/kbx81)\n- Fix LEDC 100% is not 100% duty with ESP32 IDF [esphome#6997](https://github.com/esphome/esphome/pull/6997) by [@Links2004](https://github.com/Links2004)
diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index e79e820..f1a2201 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: 2024.6.3
+version: 2024.6.4
 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 5515591..7bed21a 100644
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1,10 +1,3 @@
-## 2024.6.3
-
-- [safe_mode] Set safe mode core data in disabled cases [esphome#6983](https://github.com/esphome/esphome/pull/6983) by [@jesserockz](https://github.com/jesserockz)
-- [ota-esphome] Validate for multiple esphome ota instances [esphome#6984](https://github.com/esphome/esphome/pull/6984) by [@kbx81](https://github.com/kbx81)
-- Improve 'body' handling in http_request on_response triggers [esphome#6968](https://github.com/esphome/esphome/pull/6968) by [@kpfleming](https://github.com/kpfleming)
-- [ds1307] Initialize uninitialized struct members [esphome#6985](https://github.com/esphome/esphome/pull/6985) by [@ptr727](https://github.com/ptr727)
-- Fix float encoding in modbus server [esphome#6986](https://github.com/esphome/esphome/pull/6986) by [@Petapton](https://github.com/Petapton)
-- [dallas_temp] fix ds18s20 temp calc [esphome#6988](https://github.com/esphome/esphome/pull/6988) by [@ssieb](https://github.com/ssieb)
-- [modbus-text-sensor] fix potential buffer overflow [esphome#6993](https://github.com/esphome/esphome/pull/6993) by [@dudanov](https://github.com/dudanov)
+## 2024.6.4
 
+- [ota-esphome] Merge configurations by port [esphome#7001](https://github.com/esphome/esphome/pull/7001) by [@kbx81](https://github.com/kbx81)\n- Fix LEDC 100% is not 100% duty with ESP32 IDF [esphome#6997](https://github.com/esphome/esphome/pull/6997) by [@Links2004](https://github.com/Links2004)
diff --git a/esphome/config.yaml b/esphome/config.yaml
index 23966f6..6633931 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 init: false
 startup: services
 name: ESPHome
-version: 2024.6.3
+version: 2024.6.4
 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 962961e..cdd9029 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: "2024.6.3"  # BETA
+  version: "2024.6.4"  # 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: "2024.6.3"  # STABLE
+  version: "2024.6.4"  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio