diff --git a/esphome-beta/CHANGELOG.md b/esphome-beta/CHANGELOG.md
index 103050d..ef57c6f 100644
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1,6 +1,122 @@
-## 2023.6.0b7
+## 2023.6.0
 
+## Full list of changes
+
+### New Components
+
+- Rp2040 pio ledstrip [esphome#4818](https://github.com/esphome/esphome/pull/4818) by [@Papa-DMan](https://github.com/Papa-DMan) (new-integration)
+- Add support for TMP1075 temperature sensor [esphome#4776](https://github.com/esphome/esphome/pull/4776) by [@sybrenstuvel](https://github.com/sybrenstuvel) (new-integration)
+- Add Alarm Control Panel [esphome#4770](https://github.com/esphome/esphome/pull/4770) by [@grahambrown11](https://github.com/grahambrown11) (new-integration)
 - airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+
+### Breaking Changes
+
+- Add transparency support to all image types [esphome#4600](https://github.com/esphome/esphome/pull/4600) by [@guillempages](https://github.com/guillempages) (breaking-change)
+- Allow i2s microphone bits per sample to be configured [esphome#4884](https://github.com/esphome/esphome/pull/4884) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Move ESPTime into core esphome namespace [esphome#4926](https://github.com/esphome/esphome/pull/4926) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- display: add `BaseImage` and provide only `Image::get_pixel` method [esphome#4932](https://github.com/esphome/esphome/pull/4932) by [@ayufan](https://github.com/ayufan) (breaking-change)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+
+### Beta Changes
+
+- Add support in vbus component for Deltasol BS 2009 [esphome#4943](https://github.com/esphome/esphome/pull/4943) by [@clydebarrow](https://github.com/clydebarrow)
+- fix vbus sensor offsets [esphome#4952](https://github.com/esphome/esphome/pull/4952) by [@ssieb](https://github.com/ssieb)
+- Add support for ESP32-S3-BOX-Lite displays [esphome#4941](https://github.com/esphome/esphome/pull/4941) by [@guillempages](https://github.com/guillempages)
+- Split display_buffer sub-components into own files [esphome#4950](https://github.com/esphome/esphome/pull/4950) by [@guillempages](https://github.com/guillempages)
+- Add support for S3 box display [esphome#4942](https://github.com/esphome/esphome/pull/4942) by [@guillempages](https://github.com/guillempages)
+- display: allow to align image with `ImageAlign` [esphome#4933](https://github.com/esphome/esphome/pull/4933) by [@ayufan](https://github.com/ayufan)
+- Use HW SPI for rp2040 [esphome#4955](https://github.com/esphome/esphome/pull/4955) by [@jesserockz](https://github.com/jesserockz)
+- Fix for Fujitsu AC not having Quiet Fan Mode [esphome#4962](https://github.com/esphome/esphome/pull/4962) by [@TaruDesigns](https://github.com/TaruDesigns)
+- Store app comment and compilation_time in flash [esphome#4945](https://github.com/esphome/esphome/pull/4945) by [@bdraco](https://github.com/bdraco)
+- Construct web_server assets at build time instead of run time [esphome#4944](https://github.com/esphome/esphome/pull/4944) by [@bdraco](https://github.com/bdraco)
+- Update pca9685_output.cpp [esphome#4929](https://github.com/esphome/esphome/pull/4929) by [@standahabich](https://github.com/standahabich)
+- Apply configured IIR filter setting in generated BMP280 code [esphome#4975](https://github.com/esphome/esphome/pull/4975) by [@murrayma](https://github.com/murrayma)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Make growatt play nicer with other modbus components. [esphome#4947](https://github.com/esphome/esphome/pull/4947) by [@onnlucky](https://github.com/onnlucky)
+- Bump esphome-dashboard to 20230621.0 [esphome#4980](https://github.com/esphome/esphome/pull/4980) by [@jesserockz](https://github.com/jesserockz)
+- Fix pypi release [esphome#4983](https://github.com/esphome/esphome/pull/4983) by [@jesserockz](https://github.com/jesserockz)
+- Add configuration option to disable the log UI. [esphome#4419](https://github.com/esphome/esphome/pull/4419) by [@dd32](https://github.com/dd32)
+- Update webserver and captive portal pages to 67c48ee9 [esphome#4986](https://github.com/esphome/esphome/pull/4986) by [@jesserockz](https://github.com/jesserockz)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+- dashboard: Adds "compressed=1" to /download.bin endpoint. (...) [esphome#4966](https://github.com/esphome/esphome/pull/4966) by [@fdcastel](https://github.com/fdcastel)
+
+### All changes
+
+- Add minimum RSSI check to ble presence [esphome#4646](https://github.com/esphome/esphome/pull/4646) by [@nielsnl68](https://github.com/nielsnl68)
+- Run black over tests folder [esphome#4824](https://github.com/esphome/esphome/pull/4824) by [@jesserockz](https://github.com/jesserockz)
+- Use token so PR checks are run [esphome#4834](https://github.com/esphome/esphome/pull/4834) by [@jesserockz](https://github.com/jesserockz)
+- Fix stale bot ignoring not-stale [esphome#4836](https://github.com/esphome/esphome/pull/4836) by [@jesserockz](https://github.com/jesserockz)
+- Rework CI into multiple dependent jobs [esphome#4823](https://github.com/esphome/esphome/pull/4823) by [@jesserockz](https://github.com/jesserockz)
+- Add DNS to Text info [esphome#4821](https://github.com/esphome/esphome/pull/4821) by [@max246](https://github.com/max246)
+- allow to use MQTT for discovery of IPs if mDNS is no option  [esphome#3887](https://github.com/esphome/esphome/pull/3887) by [@Links2004](https://github.com/Links2004)
+- Move some I2C logic out of header file [esphome#4839](https://github.com/esphome/esphome/pull/4839) by [@CarsonF](https://github.com/CarsonF)
+- Allow substitutions to be valid names [esphome#4726](https://github.com/esphome/esphome/pull/4726) by [@jgoguen](https://github.com/jgoguen)
+- Insert Europe Tank Types from mopeka_std_check [esphome#4757](https://github.com/esphome/esphome/pull/4757) by [@lukasl96](https://github.com/lukasl96)
+- Bump tornado from 6.3.1 to 6.3.2 [esphome#4841](https://github.com/esphome/esphome/pull/4841) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pylint from 2.17.3 to 2.17.4 [esphome#4843](https://github.com/esphome/esphome/pull/4843) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump zeroconf from 0.60.0 to 0.62.0 [esphome#4781](https://github.com/esphome/esphome/pull/4781) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pyupgrade from 3.3.2 to 3.4.0 [esphome#4842](https://github.com/esphome/esphome/pull/4842) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump platformio from 6.1.6 to 6.1.7 [esphome#4795](https://github.com/esphome/esphome/pull/4795) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Migrate e131 to use socket instead of WiFiUDP arduino library [esphome#4832](https://github.com/esphome/esphome/pull/4832) by [@jesserockz](https://github.com/jesserockz)
+- Add transparency support to all image types [esphome#4600](https://github.com/esphome/esphome/pull/4600) by [@guillempages](https://github.com/guillempages) (breaking-change)
+- Run YAML test 8 during CI and fix board used [esphome#4862](https://github.com/esphome/esphome/pull/4862) by [@kroimon](https://github.com/kroimon)
+- Rp2040 pio ledstrip [esphome#4818](https://github.com/esphome/esphome/pull/4818) by [@Papa-DMan](https://github.com/Papa-DMan) (new-integration)
+- [ILI9xxx] Update ili9xxx_init.h code for the ILI9488 display for correct white balance [esphome#4849](https://github.com/esphome/esphome/pull/4849) by [@lucasreiners](https://github.com/lucasreiners)
+- Update codeowners [esphome#4875](https://github.com/esphome/esphome/pull/4875) by [@freekode](https://github.com/freekode)
+- Fix rp2040_pio_led_strip color modes [esphome#4887](https://github.com/esphome/esphome/pull/4887) by [@jesserockz](https://github.com/jesserockz)
+- Add i2s mclk [esphome#4885](https://github.com/esphome/esphome/pull/4885) by [@rpatel3001](https://github.com/rpatel3001)
+- Allow partially looping animations [esphome#4693](https://github.com/esphome/esphome/pull/4693) by [@guillempages](https://github.com/guillempages)
+- Allow i2s microphone bits per sample to be configured [esphome#4884](https://github.com/esphome/esphome/pull/4884) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Add support for TMP1075 temperature sensor [esphome#4776](https://github.com/esphome/esphome/pull/4776) by [@sybrenstuvel](https://github.com/sybrenstuvel) (new-integration)
+- move pio tools to LED component [esphome#4903](https://github.com/esphome/esphome/pull/4903) by [@ssieb](https://github.com/ssieb)
+- add SUB_SELECT macro [esphome#4897](https://github.com/esphome/esphome/pull/4897) by [@regevbr](https://github.com/regevbr)
+- add SUB_SWITCH macro [esphome#4898](https://github.com/esphome/esphome/pull/4898) by [@regevbr](https://github.com/regevbr)
+- esp32_rmt_led_strip: fix compile with ESP-IDF >= 5 [esphome#4856](https://github.com/esphome/esphome/pull/4856) by [@stintel](https://github.com/stintel)
+- Bump aioesphomeapi from 13.7.5 to 13.9.0 [esphome#4907](https://github.com/esphome/esphome/pull/4907) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- ota: fix compile with ESP-IDF >= 5 [esphome#4857](https://github.com/esphome/esphome/pull/4857) by [@stintel](https://github.com/stintel)
+- ota: fix TWDT with ESP-IDF >= 5 [esphome#4858](https://github.com/esphome/esphome/pull/4858) by [@stintel](https://github.com/stintel)
+- light: fix compile with ESP-IDF >= 5 [esphome#4855](https://github.com/esphome/esphome/pull/4855) by [@stintel](https://github.com/stintel)
+- Continuous voice_assistant and silence detection [esphome#4892](https://github.com/esphome/esphome/pull/4892) by [@jesserockz](https://github.com/jesserockz)
+- Allow WIFI to be disabled and enabled [esphome#4810](https://github.com/esphome/esphome/pull/4810) by [@jesserockz](https://github.com/jesserockz)
+- Bump frenck/action-yamllint from 1.4.0 to 1.4.1 [esphome#4876](https://github.com/esphome/esphome/pull/4876) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest-cov from 4.0.0 to 4.1.0 [esphome#4888](https://github.com/esphome/esphome/pull/4888) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump zeroconf from 0.62.0 to 0.63.0 [esphome#4890](https://github.com/esphome/esphome/pull/4890) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump esptool from 4.5.1 to 4.6 [esphome#4906](https://github.com/esphome/esphome/pull/4906) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- prometheus: fix compilation with EntityBase [esphome#4895](https://github.com/esphome/esphome/pull/4895) by [@mischief](https://github.com/mischief)
+- Support for Adafruit ESP32-S2 TFT Feather [esphome#4912](https://github.com/esphome/esphome/pull/4912) by [@PlainTechEnthusiast](https://github.com/PlainTechEnthusiast)
+- Add support for mdi images [esphome#4654](https://github.com/esphome/esphome/pull/4654) by [@guillempages](https://github.com/guillempages)
+- Increase SNTP setup priority [esphome#4917](https://github.com/esphome/esphome/pull/4917) by [@droscy](https://github.com/droscy)
+- Bump aioesphomeapi from 13.9.0 to 14.0.0 [esphome#4925](https://github.com/esphome/esphome/pull/4925) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bluetooth Proxy: Raw bundled advertisements [esphome#4924](https://github.com/esphome/esphome/pull/4924) by [@jesserockz](https://github.com/jesserockz)
+- Move ESPTime into core esphome namespace [esphome#4926](https://github.com/esphome/esphome/pull/4926) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Allow multiple MAC addresses for 'on_ble_advertise' filter [esphome#4773](https://github.com/esphome/esphome/pull/4773) by [@RoboMagus](https://github.com/RoboMagus)
+- Add SVG image support [esphome#4922](https://github.com/esphome/esphome/pull/4922) by [@guillempages](https://github.com/guillempages)
+- Add !extend to devcontainer's customTags [esphome#4749](https://github.com/esphome/esphome/pull/4749) by [@jimtng](https://github.com/jimtng)
+- [max7219digit] fix 270° rotation [esphome#4930](https://github.com/esphome/esphome/pull/4930) by [@spezifisch](https://github.com/spezifisch)
+- proto generation updates [esphome#4653](https://github.com/esphome/esphome/pull/4653) by [@jesserockz](https://github.com/jesserockz)
+- I2S media player allow setting communication format for external DACs [esphome#4918](https://github.com/esphome/esphome/pull/4918) by [@ccorderor](https://github.com/ccorderor)
+- Add MULTI_CONF to pn53_i2c [esphome#4938](https://github.com/esphome/esphome/pull/4938) by [@jesserockz](https://github.com/jesserockz)
+- display: Improve Image rendering by removing usage of virtual functions [esphome#4931](https://github.com/esphome/esphome/pull/4931) by [@ayufan](https://github.com/ayufan)
+- display: add `BaseImage` and provide only `Image::get_pixel` method [esphome#4932](https://github.com/esphome/esphome/pull/4932) by [@ayufan](https://github.com/ayufan) (breaking-change)
+- Add Alarm Control Panel [esphome#4770](https://github.com/esphome/esphome/pull/4770) by [@grahambrown11](https://github.com/grahambrown11) (new-integration)
+- Add support in vbus component for Deltasol BS 2009 [esphome#4943](https://github.com/esphome/esphome/pull/4943) by [@clydebarrow](https://github.com/clydebarrow)
+- fix vbus sensor offsets [esphome#4952](https://github.com/esphome/esphome/pull/4952) by [@ssieb](https://github.com/ssieb)
+- Add support for ESP32-S3-BOX-Lite displays [esphome#4941](https://github.com/esphome/esphome/pull/4941) by [@guillempages](https://github.com/guillempages)
+- Split display_buffer sub-components into own files [esphome#4950](https://github.com/esphome/esphome/pull/4950) by [@guillempages](https://github.com/guillempages)
+- Add support for S3 box display [esphome#4942](https://github.com/esphome/esphome/pull/4942) by [@guillempages](https://github.com/guillempages)
+- display: allow to align image with `ImageAlign` [esphome#4933](https://github.com/esphome/esphome/pull/4933) by [@ayufan](https://github.com/ayufan)
+- Use HW SPI for rp2040 [esphome#4955](https://github.com/esphome/esphome/pull/4955) by [@jesserockz](https://github.com/jesserockz)
+- Fix for Fujitsu AC not having Quiet Fan Mode [esphome#4962](https://github.com/esphome/esphome/pull/4962) by [@TaruDesigns](https://github.com/TaruDesigns)
+- Store app comment and compilation_time in flash [esphome#4945](https://github.com/esphome/esphome/pull/4945) by [@bdraco](https://github.com/bdraco)
+- Construct web_server assets at build time instead of run time [esphome#4944](https://github.com/esphome/esphome/pull/4944) by [@bdraco](https://github.com/bdraco)
+- Update pca9685_output.cpp [esphome#4929](https://github.com/esphome/esphome/pull/4929) by [@standahabich](https://github.com/standahabich)
+- Apply configured IIR filter setting in generated BMP280 code [esphome#4975](https://github.com/esphome/esphome/pull/4975) by [@murrayma](https://github.com/murrayma)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Make growatt play nicer with other modbus components. [esphome#4947](https://github.com/esphome/esphome/pull/4947) by [@onnlucky](https://github.com/onnlucky)
+- Bump esphome-dashboard to 20230621.0 [esphome#4980](https://github.com/esphome/esphome/pull/4980) by [@jesserockz](https://github.com/jesserockz)
+- Fix pypi release [esphome#4983](https://github.com/esphome/esphome/pull/4983) by [@jesserockz](https://github.com/jesserockz)
+- Add configuration option to disable the log UI. [esphome#4419](https://github.com/esphome/esphome/pull/4419) by [@dd32](https://github.com/dd32)
+- Update webserver and captive portal pages to 67c48ee9 [esphome#4986](https://github.com/esphome/esphome/pull/4986) by [@jesserockz](https://github.com/jesserockz)
 - Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
 - dashboard: Adds "compressed=1" to /download.bin endpoint. (...) [esphome#4966](https://github.com/esphome/esphome/pull/4966) by [@fdcastel](https://github.com/fdcastel)
 
diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index 223eaa2..f92d52f 100644
--- a/esphome-beta/config.yaml
+++ b/esphome-beta/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 - '*/*/'
 init: false
 name: ESPHome (beta)
-version: 2023.6.0b7
+version: 2023.6.0
 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 52cec77..ef57c6f 100644
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1,4 +1,122 @@
-## 2023.5.5
+## 2023.6.0
 
-- Fix version printing not breaking yaml parsing [esphome#4904](https://github.com/esphome/esphome/pull/4904) by [@jesserockz](https://github.com/jesserockz)
+## Full list of changes
+
+### New Components
+
+- Rp2040 pio ledstrip [esphome#4818](https://github.com/esphome/esphome/pull/4818) by [@Papa-DMan](https://github.com/Papa-DMan) (new-integration)
+- Add support for TMP1075 temperature sensor [esphome#4776](https://github.com/esphome/esphome/pull/4776) by [@sybrenstuvel](https://github.com/sybrenstuvel) (new-integration)
+- Add Alarm Control Panel [esphome#4770](https://github.com/esphome/esphome/pull/4770) by [@grahambrown11](https://github.com/grahambrown11) (new-integration)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+
+### Breaking Changes
+
+- Add transparency support to all image types [esphome#4600](https://github.com/esphome/esphome/pull/4600) by [@guillempages](https://github.com/guillempages) (breaking-change)
+- Allow i2s microphone bits per sample to be configured [esphome#4884](https://github.com/esphome/esphome/pull/4884) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Move ESPTime into core esphome namespace [esphome#4926](https://github.com/esphome/esphome/pull/4926) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- display: add `BaseImage` and provide only `Image::get_pixel` method [esphome#4932](https://github.com/esphome/esphome/pull/4932) by [@ayufan](https://github.com/ayufan) (breaking-change)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+
+### Beta Changes
+
+- Add support in vbus component for Deltasol BS 2009 [esphome#4943](https://github.com/esphome/esphome/pull/4943) by [@clydebarrow](https://github.com/clydebarrow)
+- fix vbus sensor offsets [esphome#4952](https://github.com/esphome/esphome/pull/4952) by [@ssieb](https://github.com/ssieb)
+- Add support for ESP32-S3-BOX-Lite displays [esphome#4941](https://github.com/esphome/esphome/pull/4941) by [@guillempages](https://github.com/guillempages)
+- Split display_buffer sub-components into own files [esphome#4950](https://github.com/esphome/esphome/pull/4950) by [@guillempages](https://github.com/guillempages)
+- Add support for S3 box display [esphome#4942](https://github.com/esphome/esphome/pull/4942) by [@guillempages](https://github.com/guillempages)
+- display: allow to align image with `ImageAlign` [esphome#4933](https://github.com/esphome/esphome/pull/4933) by [@ayufan](https://github.com/ayufan)
+- Use HW SPI for rp2040 [esphome#4955](https://github.com/esphome/esphome/pull/4955) by [@jesserockz](https://github.com/jesserockz)
+- Fix for Fujitsu AC not having Quiet Fan Mode [esphome#4962](https://github.com/esphome/esphome/pull/4962) by [@TaruDesigns](https://github.com/TaruDesigns)
+- Store app comment and compilation_time in flash [esphome#4945](https://github.com/esphome/esphome/pull/4945) by [@bdraco](https://github.com/bdraco)
+- Construct web_server assets at build time instead of run time [esphome#4944](https://github.com/esphome/esphome/pull/4944) by [@bdraco](https://github.com/bdraco)
+- Update pca9685_output.cpp [esphome#4929](https://github.com/esphome/esphome/pull/4929) by [@standahabich](https://github.com/standahabich)
+- Apply configured IIR filter setting in generated BMP280 code [esphome#4975](https://github.com/esphome/esphome/pull/4975) by [@murrayma](https://github.com/murrayma)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Make growatt play nicer with other modbus components. [esphome#4947](https://github.com/esphome/esphome/pull/4947) by [@onnlucky](https://github.com/onnlucky)
+- Bump esphome-dashboard to 20230621.0 [esphome#4980](https://github.com/esphome/esphome/pull/4980) by [@jesserockz](https://github.com/jesserockz)
+- Fix pypi release [esphome#4983](https://github.com/esphome/esphome/pull/4983) by [@jesserockz](https://github.com/jesserockz)
+- Add configuration option to disable the log UI. [esphome#4419](https://github.com/esphome/esphome/pull/4419) by [@dd32](https://github.com/dd32)
+- Update webserver and captive portal pages to 67c48ee9 [esphome#4986](https://github.com/esphome/esphome/pull/4986) by [@jesserockz](https://github.com/jesserockz)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+- dashboard: Adds "compressed=1" to /download.bin endpoint. (...) [esphome#4966](https://github.com/esphome/esphome/pull/4966) by [@fdcastel](https://github.com/fdcastel)
+
+### All changes
+
+- Add minimum RSSI check to ble presence [esphome#4646](https://github.com/esphome/esphome/pull/4646) by [@nielsnl68](https://github.com/nielsnl68)
+- Run black over tests folder [esphome#4824](https://github.com/esphome/esphome/pull/4824) by [@jesserockz](https://github.com/jesserockz)
+- Use token so PR checks are run [esphome#4834](https://github.com/esphome/esphome/pull/4834) by [@jesserockz](https://github.com/jesserockz)
+- Fix stale bot ignoring not-stale [esphome#4836](https://github.com/esphome/esphome/pull/4836) by [@jesserockz](https://github.com/jesserockz)
+- Rework CI into multiple dependent jobs [esphome#4823](https://github.com/esphome/esphome/pull/4823) by [@jesserockz](https://github.com/jesserockz)
+- Add DNS to Text info [esphome#4821](https://github.com/esphome/esphome/pull/4821) by [@max246](https://github.com/max246)
+- allow to use MQTT for discovery of IPs if mDNS is no option  [esphome#3887](https://github.com/esphome/esphome/pull/3887) by [@Links2004](https://github.com/Links2004)
+- Move some I2C logic out of header file [esphome#4839](https://github.com/esphome/esphome/pull/4839) by [@CarsonF](https://github.com/CarsonF)
+- Allow substitutions to be valid names [esphome#4726](https://github.com/esphome/esphome/pull/4726) by [@jgoguen](https://github.com/jgoguen)
+- Insert Europe Tank Types from mopeka_std_check [esphome#4757](https://github.com/esphome/esphome/pull/4757) by [@lukasl96](https://github.com/lukasl96)
+- Bump tornado from 6.3.1 to 6.3.2 [esphome#4841](https://github.com/esphome/esphome/pull/4841) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pylint from 2.17.3 to 2.17.4 [esphome#4843](https://github.com/esphome/esphome/pull/4843) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump zeroconf from 0.60.0 to 0.62.0 [esphome#4781](https://github.com/esphome/esphome/pull/4781) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pyupgrade from 3.3.2 to 3.4.0 [esphome#4842](https://github.com/esphome/esphome/pull/4842) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump platformio from 6.1.6 to 6.1.7 [esphome#4795](https://github.com/esphome/esphome/pull/4795) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Migrate e131 to use socket instead of WiFiUDP arduino library [esphome#4832](https://github.com/esphome/esphome/pull/4832) by [@jesserockz](https://github.com/jesserockz)
+- Add transparency support to all image types [esphome#4600](https://github.com/esphome/esphome/pull/4600) by [@guillempages](https://github.com/guillempages) (breaking-change)
+- Run YAML test 8 during CI and fix board used [esphome#4862](https://github.com/esphome/esphome/pull/4862) by [@kroimon](https://github.com/kroimon)
+- Rp2040 pio ledstrip [esphome#4818](https://github.com/esphome/esphome/pull/4818) by [@Papa-DMan](https://github.com/Papa-DMan) (new-integration)
+- [ILI9xxx] Update ili9xxx_init.h code for the ILI9488 display for correct white balance [esphome#4849](https://github.com/esphome/esphome/pull/4849) by [@lucasreiners](https://github.com/lucasreiners)
+- Update codeowners [esphome#4875](https://github.com/esphome/esphome/pull/4875) by [@freekode](https://github.com/freekode)
+- Fix rp2040_pio_led_strip color modes [esphome#4887](https://github.com/esphome/esphome/pull/4887) by [@jesserockz](https://github.com/jesserockz)
+- Add i2s mclk [esphome#4885](https://github.com/esphome/esphome/pull/4885) by [@rpatel3001](https://github.com/rpatel3001)
+- Allow partially looping animations [esphome#4693](https://github.com/esphome/esphome/pull/4693) by [@guillempages](https://github.com/guillempages)
+- Allow i2s microphone bits per sample to be configured [esphome#4884](https://github.com/esphome/esphome/pull/4884) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Add support for TMP1075 temperature sensor [esphome#4776](https://github.com/esphome/esphome/pull/4776) by [@sybrenstuvel](https://github.com/sybrenstuvel) (new-integration)
+- move pio tools to LED component [esphome#4903](https://github.com/esphome/esphome/pull/4903) by [@ssieb](https://github.com/ssieb)
+- add SUB_SELECT macro [esphome#4897](https://github.com/esphome/esphome/pull/4897) by [@regevbr](https://github.com/regevbr)
+- add SUB_SWITCH macro [esphome#4898](https://github.com/esphome/esphome/pull/4898) by [@regevbr](https://github.com/regevbr)
+- esp32_rmt_led_strip: fix compile with ESP-IDF >= 5 [esphome#4856](https://github.com/esphome/esphome/pull/4856) by [@stintel](https://github.com/stintel)
+- Bump aioesphomeapi from 13.7.5 to 13.9.0 [esphome#4907](https://github.com/esphome/esphome/pull/4907) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- ota: fix compile with ESP-IDF >= 5 [esphome#4857](https://github.com/esphome/esphome/pull/4857) by [@stintel](https://github.com/stintel)
+- ota: fix TWDT with ESP-IDF >= 5 [esphome#4858](https://github.com/esphome/esphome/pull/4858) by [@stintel](https://github.com/stintel)
+- light: fix compile with ESP-IDF >= 5 [esphome#4855](https://github.com/esphome/esphome/pull/4855) by [@stintel](https://github.com/stintel)
+- Continuous voice_assistant and silence detection [esphome#4892](https://github.com/esphome/esphome/pull/4892) by [@jesserockz](https://github.com/jesserockz)
+- Allow WIFI to be disabled and enabled [esphome#4810](https://github.com/esphome/esphome/pull/4810) by [@jesserockz](https://github.com/jesserockz)
+- Bump frenck/action-yamllint from 1.4.0 to 1.4.1 [esphome#4876](https://github.com/esphome/esphome/pull/4876) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest-cov from 4.0.0 to 4.1.0 [esphome#4888](https://github.com/esphome/esphome/pull/4888) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump zeroconf from 0.62.0 to 0.63.0 [esphome#4890](https://github.com/esphome/esphome/pull/4890) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump esptool from 4.5.1 to 4.6 [esphome#4906](https://github.com/esphome/esphome/pull/4906) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- prometheus: fix compilation with EntityBase [esphome#4895](https://github.com/esphome/esphome/pull/4895) by [@mischief](https://github.com/mischief)
+- Support for Adafruit ESP32-S2 TFT Feather [esphome#4912](https://github.com/esphome/esphome/pull/4912) by [@PlainTechEnthusiast](https://github.com/PlainTechEnthusiast)
+- Add support for mdi images [esphome#4654](https://github.com/esphome/esphome/pull/4654) by [@guillempages](https://github.com/guillempages)
+- Increase SNTP setup priority [esphome#4917](https://github.com/esphome/esphome/pull/4917) by [@droscy](https://github.com/droscy)
+- Bump aioesphomeapi from 13.9.0 to 14.0.0 [esphome#4925](https://github.com/esphome/esphome/pull/4925) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bluetooth Proxy: Raw bundled advertisements [esphome#4924](https://github.com/esphome/esphome/pull/4924) by [@jesserockz](https://github.com/jesserockz)
+- Move ESPTime into core esphome namespace [esphome#4926](https://github.com/esphome/esphome/pull/4926) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Allow multiple MAC addresses for 'on_ble_advertise' filter [esphome#4773](https://github.com/esphome/esphome/pull/4773) by [@RoboMagus](https://github.com/RoboMagus)
+- Add SVG image support [esphome#4922](https://github.com/esphome/esphome/pull/4922) by [@guillempages](https://github.com/guillempages)
+- Add !extend to devcontainer's customTags [esphome#4749](https://github.com/esphome/esphome/pull/4749) by [@jimtng](https://github.com/jimtng)
+- [max7219digit] fix 270° rotation [esphome#4930](https://github.com/esphome/esphome/pull/4930) by [@spezifisch](https://github.com/spezifisch)
+- proto generation updates [esphome#4653](https://github.com/esphome/esphome/pull/4653) by [@jesserockz](https://github.com/jesserockz)
+- I2S media player allow setting communication format for external DACs [esphome#4918](https://github.com/esphome/esphome/pull/4918) by [@ccorderor](https://github.com/ccorderor)
+- Add MULTI_CONF to pn53_i2c [esphome#4938](https://github.com/esphome/esphome/pull/4938) by [@jesserockz](https://github.com/jesserockz)
+- display: Improve Image rendering by removing usage of virtual functions [esphome#4931](https://github.com/esphome/esphome/pull/4931) by [@ayufan](https://github.com/ayufan)
+- display: add `BaseImage` and provide only `Image::get_pixel` method [esphome#4932](https://github.com/esphome/esphome/pull/4932) by [@ayufan](https://github.com/ayufan) (breaking-change)
+- Add Alarm Control Panel [esphome#4770](https://github.com/esphome/esphome/pull/4770) by [@grahambrown11](https://github.com/grahambrown11) (new-integration)
+- Add support in vbus component for Deltasol BS 2009 [esphome#4943](https://github.com/esphome/esphome/pull/4943) by [@clydebarrow](https://github.com/clydebarrow)
+- fix vbus sensor offsets [esphome#4952](https://github.com/esphome/esphome/pull/4952) by [@ssieb](https://github.com/ssieb)
+- Add support for ESP32-S3-BOX-Lite displays [esphome#4941](https://github.com/esphome/esphome/pull/4941) by [@guillempages](https://github.com/guillempages)
+- Split display_buffer sub-components into own files [esphome#4950](https://github.com/esphome/esphome/pull/4950) by [@guillempages](https://github.com/guillempages)
+- Add support for S3 box display [esphome#4942](https://github.com/esphome/esphome/pull/4942) by [@guillempages](https://github.com/guillempages)
+- display: allow to align image with `ImageAlign` [esphome#4933](https://github.com/esphome/esphome/pull/4933) by [@ayufan](https://github.com/ayufan)
+- Use HW SPI for rp2040 [esphome#4955](https://github.com/esphome/esphome/pull/4955) by [@jesserockz](https://github.com/jesserockz)
+- Fix for Fujitsu AC not having Quiet Fan Mode [esphome#4962](https://github.com/esphome/esphome/pull/4962) by [@TaruDesigns](https://github.com/TaruDesigns)
+- Store app comment and compilation_time in flash [esphome#4945](https://github.com/esphome/esphome/pull/4945) by [@bdraco](https://github.com/bdraco)
+- Construct web_server assets at build time instead of run time [esphome#4944](https://github.com/esphome/esphome/pull/4944) by [@bdraco](https://github.com/bdraco)
+- Update pca9685_output.cpp [esphome#4929](https://github.com/esphome/esphome/pull/4929) by [@standahabich](https://github.com/standahabich)
+- Apply configured IIR filter setting in generated BMP280 code [esphome#4975](https://github.com/esphome/esphome/pull/4975) by [@murrayma](https://github.com/murrayma)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Make growatt play nicer with other modbus components. [esphome#4947](https://github.com/esphome/esphome/pull/4947) by [@onnlucky](https://github.com/onnlucky)
+- Bump esphome-dashboard to 20230621.0 [esphome#4980](https://github.com/esphome/esphome/pull/4980) by [@jesserockz](https://github.com/jesserockz)
+- Fix pypi release [esphome#4983](https://github.com/esphome/esphome/pull/4983) by [@jesserockz](https://github.com/jesserockz)
+- Add configuration option to disable the log UI. [esphome#4419](https://github.com/esphome/esphome/pull/4419) by [@dd32](https://github.com/dd32)
+- Update webserver and captive portal pages to 67c48ee9 [esphome#4986](https://github.com/esphome/esphome/pull/4986) by [@jesserockz](https://github.com/jesserockz)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+- dashboard: Adds "compressed=1" to /download.bin endpoint. (...) [esphome#4966](https://github.com/esphome/esphome/pull/4966) by [@fdcastel](https://github.com/fdcastel)
 
diff --git a/esphome/config.yaml b/esphome/config.yaml
index 6d90a35..71591f2 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,7 +32,7 @@ backup_exclude:
 - '*/*/'
 init: false
 name: ESPHome
-version: 2023.5.5
+version: 2023.6.0
 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 7aec37f..35dea0e 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.6.0b7'  # BETA
+  version: '2023.6.0'  # 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.5.5'  # STABLE
+  version: '2023.6.0'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio