diff --git a/README.md b/README.md
index 260827e5..bd900a39 100644
--- a/README.md
+++ b/README.md
@@ -869,10 +869,10 @@ SOFTWARE.
 [spotify-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [spotify-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [spotify-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-vscode]: https://github.com/hassio-addons/addon-vscode/tree/v3.6.2
-[addon-doc-vscode]: https://github.com/hassio-addons/addon-vscode/blob/v3.6.2/README.md
+[addon-vscode]: https://github.com/hassio-addons/addon-vscode/tree/v3.7.0
+[addon-doc-vscode]: https://github.com/hassio-addons/addon-vscode/blob/v3.7.0/README.md
 [vscode-issue]: https://github.com/hassio-addons/addon-vscode/issues
-[vscode-version-shield]: https://img.shields.io/badge/version-v3.6.2-blue.svg
+[vscode-version-shield]: https://img.shields.io/badge/version-v3.7.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 53a1bf21..3c4e3836 100644
--- a/vscode/CHANGELOG.md
+++ b/vscode/CHANGELOG.md
@@ -2,17 +2,34 @@
 
 ## 🚀 Enhancements
 
-- 🏎 Enable streaming mode for Ingress @frenck (#306)
+- Migrate JSON config to YAML @frenck (#340)
+- Rename add-on to Studio Code Server @frenck (#349)
 
 ## 🧰 Maintenance
 
-- 🚀 Add-on CI improvements @frenck (#302)
-
-## 📚 Documentation
-
-- 🚑 Fix contributing link in readme @frenck (#303)
+- ⬆️ Upgrade lock-threads workflow to 3.0.0 @frenck (#327)
+- Switch to centralized GitHub Action Workflows @frenck (#339)
 
 ## ⬆️ Dependency updates
 
-- ⬆️ Upgrades add-on base image to v4.2.3 @frenck (#304)
-- ⬆️ Upgrades code-server to 3.11.1 @frenck (#305)
+- ⬆️ Bump dessant/lock-threads from 2.1.1 to 2.1.2 @dependabot (#308)
+- ⬆️ Upgrades add-on base image to v5.0.0 @frenck (#309)
+- ⬆️ Bump yamllint from 1.26.2 to 1.26.3 in /vscode @dependabot (#312)
+- ⬆️ Bump docker/build-push-action from 2.6.1 to 2.7.0 @dependabot (#311)
+- ⬆️ Bump frenck/action-addon-linter from 2.2 to 2.3 @dependabot (#313)
+- ⬆️ Bump creyD/prettier_action from 3.3 to 4.0 @dependabot (#318)
+- ⬆️ Bump docker/setup-buildx-action from 1.5.1 to 1.6.0 @dependabot (#317)
+- ⬆️ Bump frenck/action-addon-linter from 2.3 to 2.4.1 @dependabot (#325)
+- ⬆️ Bump actions/checkout from 2.3.4 to 2.3.5 @dependabot (#330)
+- ⬆️ Upgrades locales to 2.31-13+deb11u2 @frenck (#337)
+- ⬆️ Upgrades mariadb-client to 1:10.5.12-0+deb11u1 @frenck (#338)
+- ⬆️ Upgrades add-on base image to 5.2.1 @frenck (#341)
+- ⬆️ Upgrades code-server to 3.12.0 @frenck (#342)
+- ⬆️ Upgrades add-on base image to 5.2.2 @frenck (#344)
+- ⬆️ Upgrades esbenp.prettier-vscode to 9.0.0 @frenck (#345)
+- ⬆️ Upgrades lukas-tr.materialdesignicons-intellisense to 3.3.0 @frenck (#346)
+- ⬆️ Upgrades Home Assistant CLI to v4.14.0 @frenck (#347)
+- ⬆️ Upgrades keesschollaart.vscode-home-assistant to 1.22.0 @frenck (#348)
+- ⬆️ Upgrades usernamehw.errorlens to 3.4.0 @frenck (#350)
+- ⬆️ Upgrades oderwat.indent-rainbow to 8.2.2 @frenck (#351)
+- ⬆️ Upgrades redhat.vscode-yaml to 1.2.0 @frenck (#352)
diff --git a/vscode/DOCS.md b/vscode/DOCS.md
index 2fbe7c37..fd2e5b84 100644
--- a/vscode/DOCS.md
+++ b/vscode/DOCS.md
@@ -1,11 +1,9 @@
-# Home Assistant Community Add-on: Visual Studio Code
+# Home Assistant Community Add-on: Studio Code Server
 
-This add-on runs Visual Studio Code, allowing you to edit your Home Assistant
-configuration directly from your web browser and can be embedded straight
-into the Home Assistant frontend UI.
-
-Visual Studio Code runs as a remote server using `code-server`, and is a
-fully fledged VSCode experience.
+This add-on runs [code-server](https://github.com/cdr/code-server), which
+gives you a Visual Studio Code experience straight from the browser. It allows
+you to edit your Home Assistant configuration directly from your web browser,
+directly from within the Home Assistant frontend.
 
 The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed
 and pre-configured right out of the box. This means that auto-completion works
@@ -16,12 +14,12 @@ instantly, without the need for configuring anything.
 The installation of this add-on is pretty straightforward and not different in
 comparison to installing any other Home Assistant add-on.
 
-1. Search for the "Visual Studio Code" add-on in the Supervisor add-on store
+1. Search for the "Studio Code Server" add-on in the Supervisor add-on store
    and install it.
-1. Start the "Visual Studio Code" add-on.
-1. Check the logs of the "Visual Studio Code" add-on to see if everything went
+1. Start the "Studio Code Server" add-on.
+1. Check the logs of the "Studio Code Server" add-on to see if everything went
    well.
-1. Click the "OPEN WEB UI" button to open Visual Studio Code.
+1. Click the "OPEN WEB UI" button to open Studio Code Server.
 
 ## Configuration
 
diff --git a/vscode/README.md b/vscode/README.md
index 49b9029a..f9623c58 100644
--- a/vscode/README.md
+++ b/vscode/README.md
@@ -23,7 +23,7 @@ The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed
 and pre-configured right out of the box. This means that auto-completion works
 instantly, without the need for configuring anything.
 
-![Visual Studio Code in the Home Assistant Frontend][screenshot]
+![Studio Code Server in the Home Assistant Frontend][screenshot]
 
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
@@ -35,6 +35,6 @@ instantly, without the need for configuring anything.
 [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.6.2-blue.svg
-[release]: https://github.com/hassio-addons/addon-vscode/tree/v3.6.2
+[release-shield]: https://img.shields.io/badge/version-v3.7.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-vscode/tree/v3.7.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
deleted file mode 100644
index a3ef6bba..00000000
--- a/vscode/config.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "name": "Visual Studio Code",
-  "version": "3.6.2",
-  "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",
-  "ingress": true,
-  "ingress_port": 1337,
-  "ingress_stream": true,
-  "panel_icon": "mdi:microsoft-visual-studio-code",
-  "startup": "services",
-  "init": false,
-  "arch": [
-    "aarch64",
-    "amd64"
-  ],
-  "uart": true,
-  "hassio_api": true,
-  "hassio_role": "manager",
-  "homeassistant_api": true,
-  "map": [
-    "config:rw",
-    "ssl:rw",
-    "addons:rw",
-    "media:rw",
-    "share:rw",
-    "backup:rw"
-  ],
-  "services": [
-    "mysql:want",
-    "mqtt:want"
-  ],
-  "options": {
-    "packages": [],
-    "init_commands": []
-  },
-  "schema": {
-    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
-    "config_path": "str?",
-    "packages": [
-      "str"
-    ],
-    "init_commands": [
-      "str"
-    ]
-  },
-  "image": "ghcr.io/hassio-addons/vscode/{arch}"
-}
\ No newline at end of file
diff --git a/vscode/config.yaml b/vscode/config.yaml
new file mode 100644
index 00000000..b9c80b44
--- /dev/null
+++ b/vscode/config.yaml
@@ -0,0 +1,40 @@
+arch:
+- aarch64
+- amd64
+description: Fully featured Visual Studio Code (VSCode) experience integrated in the
+  Home Assistant frontend.
+hassio_api: true
+hassio_role: manager
+homeassistant_api: true
+image: ghcr.io/hassio-addons/vscode/{arch}
+ingress: true
+ingress_port: 1337
+ingress_stream: true
+init: false
+map:
+- config:rw
+- ssl:rw
+- addons:rw
+- media:rw
+- share:rw
+- backup:rw
+name: Studio Code Server
+options:
+  init_commands: []
+  packages: []
+panel_icon: mdi:microsoft-visual-studio-code
+schema:
+  config_path: str?
+  init_commands:
+  - str
+  log_level: list(trace|debug|info|notice|warning|error|fatal)?
+  packages:
+  - str
+services:
+- mysql:want
+- mqtt:want
+slug: vscode
+startup: services
+uart: true
+url: https://github.com/hassio-addons/addon-vscode
+version: 3.7.0
diff --git a/vscode/icon.png b/vscode/icon.png
index b3225e44..e33d6ee3 100644
Binary files a/vscode/icon.png and b/vscode/icon.png differ
diff --git a/vscode/logo.png b/vscode/logo.png
index 57a2ca26..e33d6ee3 100644
Binary files a/vscode/logo.png and b/vscode/logo.png differ