diff --git a/esphome-beta/CHANGELOG.md b/esphome-beta/CHANGELOG.md
index 97ea3ca..5515591 100644
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1,12 +1,10 @@
-## 2024.6.2
+## 2024.6.3
 
-- [core] Fix package merging with lists of primitives [esphome#6952](https://github.com/esphome/esphome/pull/6952) by [@jesserockz](https://github.com/jesserockz)
-- [update] Set entity_category to config & Publish state to logs [esphome#6954](https://github.com/esphome/esphome/pull/6954) by [@jesserockz](https://github.com/jesserockz)
-- Fix infinite loop in http_request for ESP-IDF. [esphome#6963](https://github.com/esphome/esphome/pull/6963) by [@kpfleming](https://github.com/kpfleming)
-- ESP-IDF 4.x expects seconds for esp_task_wdt_init(), not milliseconds. [esphome#6964](https://github.com/esphome/esphome/pull/6964) by [@kpfleming](https://github.com/kpfleming)
-- Onewire [esphome#6967](https://github.com/esphome/esphome/pull/6967) by [@ssieb](https://github.com/ssieb)
-- [http_request] memory leak fix [esphome#6973](https://github.com/esphome/esphome/pull/6973) by [@gabest11](https://github.com/gabest11)
-- Await cg.get_variable in Update component [esphome#6974](https://github.com/esphome/esphome/pull/6974) by [@bkaufx](https://github.com/bkaufx)
-- [one-wire] fix potential hang [esphome#6976](https://github.com/esphome/esphome/pull/6976) by [@ssieb](https://github.com/ssieb)
-- [midea] fix fan speed compatibility with some models [esphome#6978](https://github.com/esphome/esphome/pull/6978) by [@dudanov](https://github.com/dudanov)
+- [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)
 
diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index e9b3dce..e79e820 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.2
+version: 2024.6.3
 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 97ea3ca..5515591 100644
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1,12 +1,10 @@
-## 2024.6.2
+## 2024.6.3
 
-- [core] Fix package merging with lists of primitives [esphome#6952](https://github.com/esphome/esphome/pull/6952) by [@jesserockz](https://github.com/jesserockz)
-- [update] Set entity_category to config & Publish state to logs [esphome#6954](https://github.com/esphome/esphome/pull/6954) by [@jesserockz](https://github.com/jesserockz)
-- Fix infinite loop in http_request for ESP-IDF. [esphome#6963](https://github.com/esphome/esphome/pull/6963) by [@kpfleming](https://github.com/kpfleming)
-- ESP-IDF 4.x expects seconds for esp_task_wdt_init(), not milliseconds. [esphome#6964](https://github.com/esphome/esphome/pull/6964) by [@kpfleming](https://github.com/kpfleming)
-- Onewire [esphome#6967](https://github.com/esphome/esphome/pull/6967) by [@ssieb](https://github.com/ssieb)
-- [http_request] memory leak fix [esphome#6973](https://github.com/esphome/esphome/pull/6973) by [@gabest11](https://github.com/gabest11)
-- Await cg.get_variable in Update component [esphome#6974](https://github.com/esphome/esphome/pull/6974) by [@bkaufx](https://github.com/bkaufx)
-- [one-wire] fix potential hang [esphome#6976](https://github.com/esphome/esphome/pull/6976) by [@ssieb](https://github.com/ssieb)
-- [midea] fix fan speed compatibility with some models [esphome#6978](https://github.com/esphome/esphome/pull/6978) by [@dudanov](https://github.com/dudanov)
+- [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)
 
diff --git a/esphome/config.yaml b/esphome/config.yaml
index 414a33e..23966f6 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 init: false
 startup: services
 name: ESPHome
-version: 2024.6.2
+version: 2024.6.3
 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 4490cf5..4b22d33 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.2"  # BETA
+  version: "2024.6.3"  # 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.2"  # STABLE
+  version: "2024.6.3"  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio