diff --git a/esphome-beta/CHANGELOG.md b/esphome-beta/CHANGELOG.md
index d4ac138..eefa918 100644
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1,4 +1,5 @@
-## 2024.5.3
+## 2024.5.4
 
-- [voice_assistant] Don't allocate buffers until starting the microphone for the first time [esphome#6800](https://github.com/esphome/esphome/pull/6800) by [@jesserockz](https://github.com/jesserockz)
+- [web_server_base] Bump ESPAsyncWebServer-esphome to 3.2.2 [esphome#6797](https://github.com/esphome/esphome/pull/6797) by [@jesserockz](https://github.com/jesserockz)
+- [helpers] Move Base64 string to cpp [esphome#6819](https://github.com/esphome/esphome/pull/6819) by [@gabest11](https://github.com/gabest11)
 
diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index ff3818e..9690cad 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.5.3
+version: 2024.5.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 d4ac138..eefa918 100644
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1,4 +1,5 @@
-## 2024.5.3
+## 2024.5.4
 
-- [voice_assistant] Don't allocate buffers until starting the microphone for the first time [esphome#6800](https://github.com/esphome/esphome/pull/6800) by [@jesserockz](https://github.com/jesserockz)
+- [web_server_base] Bump ESPAsyncWebServer-esphome to 3.2.2 [esphome#6797](https://github.com/esphome/esphome/pull/6797) by [@jesserockz](https://github.com/jesserockz)
+- [helpers] Move Base64 string to cpp [esphome#6819](https://github.com/esphome/esphome/pull/6819) by [@gabest11](https://github.com/gabest11)
 
diff --git a/esphome/config.yaml b/esphome/config.yaml
index 0d25125..c1682c5 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 init: false
 startup: services
 name: ESPHome
-version: 2024.5.3
+version: 2024.5.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 4070fa1..a1217f4 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.5.3"  # BETA
+  version: "2024.5.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.5.3"  # STABLE
+  version: "2024.5.4"  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio