diff --git a/README.md b/README.md
index 11015230d..9426ac81b 100644
--- a/README.md
+++ b/README.md
@@ -1059,10 +1059,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-no-red.svg
-[addon-vscode]: https://github.com/hassio-addons/addon-vscode/tree/a6ba844
-[addon-doc-vscode]: https://github.com/hassio-addons/addon-vscode/blob/a6ba844/README.md
+[addon-vscode]: https://github.com/hassio-addons/addon-vscode/tree/8a84bb3
+[addon-doc-vscode]: https://github.com/hassio-addons/addon-vscode/blob/8a84bb3/README.md
 [vscode-issue]: https://github.com/hassio-addons/addon-vscode/issues
-[vscode-version-shield]: https://img.shields.io/badge/version-a6ba844-blue.svg
+[vscode-version-shield]: https://img.shields.io/badge/version-8a84bb3-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 cf058aa29..b55ac75d2 100644
--- a/vscode/CHANGELOG.md
+++ b/vscode/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Changelog since v5.18.1
+- user-init: Safeguarded linking directories via the --no-dereference flag to avoid link-loops. Catching linking of .gitignore and .ssh via a warning, so that s6 does does not crash (and with it, the container) (#922) 
 - 🎆 Updates maintenance/license year to 2025 (#924) 
 - ⬆️ Update ghcr.io/hassio-addons/debian-base Docker tag to v7.7.1 (#923)
 
diff --git a/vscode/README.md b/vscode/README.md
index 0cb1a3af3..bfa86d2c0 100644
--- a/vscode/README.md
+++ b/vscode/README.md
@@ -54,6 +54,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-a6ba844-blue.svg
-[release]: https://github.com/hassio-addons/addon-vscode/tree/a6ba844
+[release-shield]: https://img.shields.io/badge/version-8a84bb3-blue.svg
+[release]: https://github.com/hassio-addons/addon-vscode/tree/8a84bb3
 [screenshot]: https://github.com/hassio-addons/addon-vscode/raw/main/images/screenshot.png
\ No newline at end of file
diff --git a/vscode/config.yaml b/vscode/config.yaml
index 9e1355f4f..519815bbf 100644
--- a/vscode/config.yaml
+++ b/vscode/config.yaml
@@ -1,5 +1,5 @@
 name: Studio Code Server
-version: a6ba844
+version: 8a84bb3
 slug: vscode
 description: Fully featured Visual Studio Code (VSCode) experience integrated in the
   Home Assistant frontend.