diff --git a/Doxygen b/Doxygen
index 947e7142a..5b06d9b94 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.0b3
+PROJECT_NUMBER         = 2023.6.0b4
 
 # 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 1ffa9a749..a49b47989 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2023.6.0b3
+ESPHOME_REF = 2023.6.0b4
 
 .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 63e81e313..475a144b0 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2023.6.0b3
\ No newline at end of file
+2023.6.0b4
\ No newline at end of file
diff --git a/changelog/2023.6.0.rst b/changelog/2023.6.0.rst
index ecdb7df97..6cbba6d0e 100644
--- a/changelog/2023.6.0.rst
+++ b/changelog/2023.6.0.rst
@@ -47,6 +47,9 @@ Beta Changes
 - Store app comment and compilation_time in flash :esphomepr:`4945` by :ghuser:`bdraco`
 - Construct web_server assets at build time instead of run time :esphomepr:`4944` by :ghuser:`bdraco`
 - Update pca9685_output.cpp :esphomepr:`4929` by :ghuser:`standahabich`
+- Apply configured IIR filter setting in generated BMP280 code :esphomepr:`4975` by :ghuser:`murrayma`
+- Make growatt play nicer with other modbus components. :esphomepr:`4947` by :ghuser:`onnlucky`
+- Bump esphome-dashboard to 20230621.0 :esphomepr:`4980` by :ghuser:`jesserockz`
 
 All changes
 ^^^^^^^^^^^
@@ -119,6 +122,9 @@ All changes
 - Store app comment and compilation_time in flash :esphomepr:`4945` by :ghuser:`bdraco`
 - Construct web_server assets at build time instead of run time :esphomepr:`4944` by :ghuser:`bdraco`
 - Update pca9685_output.cpp :esphomepr:`4929` by :ghuser:`standahabich`
+- Apply configured IIR filter setting in generated BMP280 code :esphomepr:`4975` by :ghuser:`murrayma`
+- Make growatt play nicer with other modbus components. :esphomepr:`4947` by :ghuser:`onnlucky`
+- Bump esphome-dashboard to 20230621.0 :esphomepr:`4980` by :ghuser:`jesserockz`
 
 Past Changelogs
 ---------------
diff --git a/conf.py b/conf.py
index a08df1531..ce31a4d29 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.0b3"
+release = "2023.6.0b4"
 
 # 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 34c906bc7..44f180f88 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -597,6 +597,7 @@ Contributors
 - `Jeff Anderson (@jman203) <https://github.com/jman203>`__
 - `Jonathan Martens (@jmartens) <https://github.com/jmartens>`__
 - `jmichiel (@jmichiel) <https://github.com/jmichiel>`__
+- `JMoratelli (@JMoratelli) <https://github.com/JMoratelli>`__
 - `Jonathas Barbosa (@jnthas) <https://github.com/jnthas>`__
 - `Joe Gross (@joegross) <https://github.com/joegross>`__
 - `Johan van der Kuijl (@johanvanderkuijl) <https://github.com/johanvanderkuijl>`__
@@ -657,6 +658,7 @@ Contributors
 - `kokangit (@kokangit) <https://github.com/kokangit>`__
 - `konsulten (@konsulten) <https://github.com/konsulten>`__
 - `Kevin Pelzel (@kpelzel) <https://github.com/kpelzel>`__
+- `Kevin P. Fleming (@kpfleming) <https://github.com/kpfleming>`__
 - `Karl Q. (@kquinsland) <https://github.com/kquinsland>`__
 - `Kodey Converse (@krconv) <https://github.com/krconv>`__
 - `KristopherMackowiak (@KristopherMackowiak) <https://github.com/KristopherMackowiak>`__
@@ -792,7 +794,6 @@ Contributors
 - `mnltake (@mnltake) <https://github.com/mnltake>`__
 - `Matt N. (@mnoorenberghe) <https://github.com/mnoorenberghe>`__
 - `Michał Obrembski (@mobrembski) <https://github.com/mobrembski>`__
-- `Moritz Glöckl (@moritzgloeckl) <https://github.com/moritzgloeckl>`__
 - `moritzj29 (@moritzj29) <https://github.com/moritzj29>`__
 - `Chris Laplante (@mostthingsweb) <https://github.com/mostthingsweb>`__
 - `MrEditor97 (@mreditor97) <https://github.com/mreditor97>`__
@@ -1077,7 +1078,6 @@ Contributors
 - `tiagofreire-pt (@tiagofreire-pt) <https://github.com/tiagofreire-pt>`__
 - `Tijs-B (@Tijs-B) <https://github.com/Tijs-B>`__
 - `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>`__
@@ -1165,4 +1165,4 @@ Contributors
 - `Zack Barett (@zsarnett) <https://github.com/zsarnett>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated June 20, 2023.*
+*This page was last updated June 21, 2023.*