diff --git a/README.md b/README.md
index 0703640d..ebc83588 100644
--- a/README.md
+++ b/README.md
@@ -993,10 +993,10 @@ SOFTWARE.
 [unifi-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [unifi-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [unifi-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-vscode]: https://github.com/hassio-addons/addon-vscode/tree/v3.5.0
-[addon-doc-vscode]: https://github.com/hassio-addons/addon-vscode/blob/v3.5.0/README.md
+[addon-vscode]: https://github.com/hassio-addons/addon-vscode/tree/v3.6.0
+[addon-doc-vscode]: https://github.com/hassio-addons/addon-vscode/blob/v3.6.0/README.md
 [vscode-issue]: https://github.com/hassio-addons/addon-vscode/issues
-[vscode-version-shield]: https://img.shields.io/badge/version-v3.5.0-blue.svg
+[vscode-version-shield]: https://img.shields.io/badge/version-v3.6.0-blue.svg
 [vscode-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [vscode-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [vscode-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
diff --git a/vscode/CHANGELOG.md b/vscode/CHANGELOG.md
index 192bb817..79bed561 100644
--- a/vscode/CHANGELOG.md
+++ b/vscode/CHANGELOG.md
@@ -1,21 +1,15 @@
 ## What’s changed
 
-This release prepares for the upcoming Home Assistant 2021.7
-and contains the updated VSCode extensions to support the new configuration options and formats.
-
 ## ⬆️ Dependency updates
 
-- ⬆️ Upgrades keesschollaart.vscode-home-assistant to 1.19.0 @frenck (#281)
-- ⬆️ Upgrades ESPHome.esphome-vscode to 0.18.0 @frenck (#283)
-- ⬆️ Upgrades Home Assistant CLI to v4.12.3 @frenck (#266)
-- ⬆️ Bump micnncim/action-label-syncer from 1.2.0 to 1.3.0 @dependabot (#265)
-- ⬆️ Bump docker/setup-qemu-action from 1.1.0 to 1.2.0 @dependabot (#268)
-- ⬆️ Bump actions/cache from 2.1.5 to 2.1.6 @dependabot (#270)
-- ⬆️ Bump docker/build-push-action from 2.4.0 to 2.5.0 @dependabot (#269)
-- ⬆️ Bump frenck/action-addon-information from 1.1 to 1.2 @dependabot (#271)
-- ⬆️ Upgrades mariadb-client to 1:10.3.29-0+deb10u1 @frenck (#275)
-- ⬆️ Upgrades nmap to 7.70+dfsg1-6+deb10u2 @frenck (#276)
-- ⬆️ Bump docker/login-action from 1.9.0 to 1.10.0 @dependabot (#273)
-- ⬆️ Upgrades add-on base image to v4.2.1 @frenck (#277)
-- ⬆️ Bump docker/setup-buildx-action from 1.3.0 to 1.4.1 @dependabot (#279)
-- ⬆️ Upgrades usernamehw.errorlens to 3.3.0 @frenck (#282)
+- ⬆️ Upgrades code-server to 3.11.0 @frenck (#294)
+- ⬆️ Upgrades ESPHome.esphome-vscode to 0.20.0 @frenck (#295)
+- ⬆️ Upgrades keesschollaart.vscode-home-assistant to 1.20.0 @frenck (#296)
+- ⬆️ Upgrades esbenp.prettier-vscode to 8.0.1 @frenck (#297)
+- ⬆️ Bump docker/build-push-action from 2.5.0 to 2.6.1 @dependabot (#285)
+- ⬆️ Bump docker/setup-buildx-action from 1.4.1 to 1.5.0 @dependabot (#287)
+- ⬆️ Bump dessant/lock-threads from 2.0.3 to 2.1.1 @dependabot (#289)
+- ⬆️ Bump docker/setup-buildx-action from 1.5.0 to 1.5.1 @dependabot (#290)
+- ⬆️ Bump frenck/action-addon-linter from 2.1 to 2.2 @dependabot (#291)
+- ⬆️ Bump actions/stale from 3.0.19 to 4 @dependabot (#292)
+- ⬆️ Upgrades add-on base image to v4.2.2 @frenck (#293)
diff --git a/vscode/README.md b/vscode/README.md
index ece23552..c15e27e9 100644
--- a/vscode/README.md
+++ b/vscode/README.md
@@ -51,6 +51,6 @@ If you are more interested in stable releases of our add-ons:
 [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v3.5.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-vscode/tree/v3.5.0
+[release-shield]: https://img.shields.io/badge/version-v3.6.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-vscode/tree/v3.6.0
 [screenshot]: https://github.com/hassio-addons/addon-vscode/raw/main/images/screenshot.png
\ No newline at end of file
diff --git a/vscode/config.json b/vscode/config.json
index 8458fe5b..a5304af8 100644
--- a/vscode/config.json
+++ b/vscode/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Visual Studio Code",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "slug": "vscode",
   "description": "Fully featured VSCode experience, to edit your HA config in the browser, including auto-completion!",
   "url": "https://github.com/hassio-addons/addon-vscode",