diff --git a/esphome-beta/CHANGELOG.md b/esphome-beta/CHANGELOG.md
index 78c81da..fa04463 100644
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1,5 +1,8 @@
-## 2023.8.1
+## 2023.8.2
 
-- Fix checksum calculation for sml [esphome#5271](https://github.com/esphome/esphome/pull/5271) by [@Mat931](https://github.com/Mat931)
-- Change haier from AUTO to HEAT_COOL [esphome#5267](https://github.com/esphome/esphome/pull/5267) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Move libcairo to all architectures in docker [esphome#5276](https://github.com/esphome/esphome/pull/5276) by [@jesserockz](https://github.com/jesserockz)
+- Resolve offline ESPs in dashboard when using ESPHOME_DASHBOARD_USE_PING=true [esphome#5281](https://github.com/esphome/esphome/pull/5281) by [@mwolter805](https://github.com/mwolter805)
+- Align SPI data rates in C++ code with Python [esphome#5284](https://github.com/esphome/esphome/pull/5284) by [@clydebarrow](https://github.com/clydebarrow)
+- Change htu21d sensors from required to optional [esphome#5285](https://github.com/esphome/esphome/pull/5285) by [@jesserockz](https://github.com/jesserockz)
+- Reserve keyword "clock" [esphome#5279](https://github.com/esphome/esphome/pull/5279) by [@clydebarrow](https://github.com/clydebarrow)
 
diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index 4e0be07..48f1a43 100644
--- a/esphome-beta/config.yaml
+++ b/esphome-beta/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 - '*/*/'
 init: false
 name: ESPHome (beta)
-version: 2023.8.1
+version: 2023.8.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 78c81da..fa04463 100644
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1,5 +1,8 @@
-## 2023.8.1
+## 2023.8.2
 
-- Fix checksum calculation for sml [esphome#5271](https://github.com/esphome/esphome/pull/5271) by [@Mat931](https://github.com/Mat931)
-- Change haier from AUTO to HEAT_COOL [esphome#5267](https://github.com/esphome/esphome/pull/5267) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Move libcairo to all architectures in docker [esphome#5276](https://github.com/esphome/esphome/pull/5276) by [@jesserockz](https://github.com/jesserockz)
+- Resolve offline ESPs in dashboard when using ESPHOME_DASHBOARD_USE_PING=true [esphome#5281](https://github.com/esphome/esphome/pull/5281) by [@mwolter805](https://github.com/mwolter805)
+- Align SPI data rates in C++ code with Python [esphome#5284](https://github.com/esphome/esphome/pull/5284) by [@clydebarrow](https://github.com/clydebarrow)
+- Change htu21d sensors from required to optional [esphome#5285](https://github.com/esphome/esphome/pull/5285) by [@jesserockz](https://github.com/jesserockz)
+- Reserve keyword "clock" [esphome#5279](https://github.com/esphome/esphome/pull/5279) by [@clydebarrow](https://github.com/clydebarrow)
 
diff --git a/esphome/config.yaml b/esphome/config.yaml
index f47a2ac..dead8d8 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 - '*/*/'
 init: false
 name: ESPHome
-version: 2023.8.1
+version: 2023.8.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 1c39623..a5997fd 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.8.1'  # BETA
+  version: '2023.8.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.8.1'  # STABLE
+  version: '2023.8.2'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio