diff --git a/Doxygen b/Doxygen
index 8fc8b02ce..9afe1d0dc 100644
--- a/Doxygen
+++ b/Doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2024.5.4
+PROJECT_NUMBER         = 2024.5.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Makefile b/Makefile
index daef52a28..77d36816d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2024.5.4
+ESPHOME_REF = 2024.5.5
 PAGEFIND_VERSION=1.1.0
 PAGEFIND=pagefind
 NET_PAGEFIND=../pagefindbin/pagefind
diff --git a/_static/version b/_static/version
index 78ed49716..39bb57341 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2024.5.4
\ No newline at end of file
+2024.5.5
\ No newline at end of file
diff --git a/changelog/2024.5.0.rst b/changelog/2024.5.0.rst
index d64ac33db..b25010ab1 100644
--- a/changelog/2024.5.0.rst
+++ b/changelog/2024.5.0.rst
@@ -78,6 +78,14 @@ Release 2024.5.4 - May 28
 - [helpers] Move Base64 string to cpp :esphomepr:`6819` by :ghuser:`gabest11`
 
 
+Release 2024.5.5 - June 5
+-------------------------
+
+- [voice_assistant] Half the microphone ringbuffer size :esphomepr:`6830` by :ghuser:`jesserockz`
+- [i2s_speaker] Add buffer allocation failure checks :esphomepr:`6829` by :ghuser:`jesserockz`
+- [improv_serial] Fix for IDF 4.4.7 :esphomepr:`6855` by :ghuser:`kbx81`
+
+
 Full list of changes
 --------------------
 
diff --git a/conf.py b/conf.py
index 222ec9a44..70dab703b 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,7 @@ author = "ESPHome"
 # The short X.Y version.
 version = "2024.5"
 # The full version, including alpha/beta/rc tags.
-release = "2024.5.4"
+release = "2024.5.5"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/guides/supporters.rst b/guides/supporters.rst
index 7e46bb297..7a84330ba 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -449,7 +449,6 @@ Contributors
 - `Eenoo (@Eenoo) <https://github.com/Eenoo>`__
 - `Eli Fidler (@efidler) <https://github.com/efidler>`__
 - `egandro (@egandro) <https://github.com/egandro>`__
-- `Erwin Kooi (@egeltje) <https://github.com/egeltje>`__
 - `Maxime Michel (@Egglestron) <https://github.com/Egglestron>`__
 - `Eike (@ei-ke) <https://github.com/ei-ke>`__
 - `Elazar Leibovich (@elazarl) <https://github.com/elazarl>`__
@@ -1048,6 +1047,7 @@ Contributors
 - `Mike Lynch (@Prow7) <https://github.com/Prow7>`__
 - `Peter Sarossy (@psarossy) <https://github.com/psarossy>`__
 - `Peter Tatrai (@ptatrai) <https://github.com/ptatrai>`__
+- `Pieter Viljoen (@ptr727) <https://github.com/ptr727>`__
 - `Leandro Puerari (@puerari) <https://github.com/puerari>`__
 - `puuu (@puuu) <https://github.com/puuu>`__
 - `Pascal Vizeli (@pvizeli) <https://github.com/pvizeli>`__
@@ -1374,4 +1374,4 @@ Contributors
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 - `Zynth-dev (@Zynth-dev) <https://github.com/Zynth-dev>`__
 
-*This page was last updated May 28, 2024.*
+*This page was last updated June 5, 2024.*