diff --git a/Doxygen b/Doxygen
index 23b381eb5..60cb455f9 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         = 2023.6.3
+PROJECT_NUMBER         = 2023.6.4
 
 # 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 2c7b3b09e..0865267f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2023.6.3
+ESPHOME_REF = 2023.6.4
 
 .PHONY: html html-strict cleanhtml deploy help live-html Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify
 
diff --git a/_static/version b/_static/version
index 8e757af5e..7af6e8ee8 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2023.6.3
\ No newline at end of file
+2023.6.4
\ No newline at end of file
diff --git a/changelog/2023.6.0.rst b/changelog/2023.6.0.rst
index 804ed8e43..edd7189b4 100644
--- a/changelog/2023.6.0.rst
+++ b/changelog/2023.6.0.rst
@@ -69,6 +69,14 @@ Release 2023.6.3 - June 28
 - Fixes compressed downloads :esphomepr:`5014` by :ghuser:`fdcastel`
 - Add CONFIG_BT_BLE_42_FEATURES_SUPPORTED for ble :esphomepr:`5008` by :ghuser:`jesserockz`
 
+Release 2023.6.4 - July 4
+-------------------------
+
+- [SCD30] Disable negative temperature offset :esphomepr:`4850` by :ghuser:`ardichoke`
+- fix template binary_sensor publish_initial_state option :esphomepr:`5033` by :ghuser:`dudanov`
+- Add alarm to reserved ids :esphomepr:`5042` by :ghuser:`grahambrown11`
+- Advertise noise is enabled :esphomepr:`5034` by :ghuser:`bdraco`
+- Update webserver to ea86d81 :esphomepr:`5023` by :ghuser:`jesserockz`
 
 Breaking Changes
 ----------------
diff --git a/conf.py b/conf.py
index d72230b47..02e7a40c0 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,7 @@ author = "ESPHome"
 # The short X.Y version.
 version = "2023.6"
 # The full version, including alpha/beta/rc tags.
-release = "2023.6.3"
+release = "2023.6.4"
 
 # 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 b945c4d78..15674b883 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -303,6 +303,7 @@ Contributors
 - `dckiller51 (@dckiller51) <https://github.com/dckiller51>`__
 - `Daniel Correa Lobato (@dclobato) <https://github.com/dclobato>`__
 - `Dion Hulse (@dd32) <https://github.com/dd32>`__
+- `ddt154 (@ddt154) <https://github.com/ddt154>`__
 - `DeadEnd (@DeadEnded) <https://github.com/DeadEnded>`__
 - `Debashish Sahu (@debsahu) <https://github.com/debsahu>`__
 - `declanshanaghy (@declanshanaghy) <https://github.com/declanshanaghy>`__
@@ -518,6 +519,7 @@ Contributors
 - `Ha Thach (@hathach) <https://github.com/hathach>`__
 - `hcoohb (@hcoohb) <https://github.com/hcoohb>`__
 - `Héctor Giménez (@hectorgimenez) <https://github.com/hectorgimenez>`__
+- `hellotomtom (@hellotomtom) <https://github.com/hellotomtom>`__
 - `Jimmy Hedman (@HeMan) <https://github.com/HeMan>`__
 - `Hemi03 (@Hemi03) <https://github.com/Hemi03>`__
 - `HepoH3 (@HepoH3) <https://github.com/HepoH3>`__
@@ -1124,6 +1126,7 @@ Contributors
 - `Tijs-B (@Tijs-B) <https://github.com/Tijs-B>`__
 - `Tim Boldt (@timboldt) <https://github.com/timboldt>`__
 - `Tim Laurence (@timdaman) <https://github.com/timdaman>`__
+- `Aidan Timson (@timmo001) <https://github.com/timmo001>`__
 - `Tim Niemueller (@timn) <https://github.com/timn>`__
 - `Tim Savage (@timsavage) <https://github.com/timsavage>`__
 - `Tinkerfish (@tinkerfish) <https://github.com/tinkerfish>`__
@@ -1217,4 +1220,4 @@ Contributors
 - `Zack Barett (@zsarnett) <https://github.com/zsarnett>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated June 28, 2023.*
+*This page was last updated July 4, 2023.*