diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index 6671db3..ec2d96f 100755
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.3.1
+ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:6.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -36,7 +36,7 @@ RUN \
         net-tools=1.60+git20181103.0eebece-1 \
         nmap=7.91+dfsg1+really7.80+dfsg1-2 \
         openssh-client=1:8.4p1-5 \
-        openssl=1.1.1n-0+deb11u1 \
+        openssl=1.1.1n-0+deb11u2 \
         python3-dev=3.9.2-3 \
         python3=3.9.2-3 \
         unzip=6.0-26 \
diff --git a/vscode/build.yaml b/vscode/build.yaml
index f47c58f..aac540e 100644
--- a/vscode/build.yaml
+++ b/vscode/build.yaml
@@ -1,7 +1,7 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.1
-  amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.1
+  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:6.0.0
+  amd64: ghcr.io/hassio-addons/debian-base/amd64:6.0.0
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev
diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh
old mode 100644
new mode 100755
index eee73ef..0bc2e5b
--- a/vscode/rootfs/etc/cont-init.d/code-server.sh
+++ b/vscode/rootfs/etc/cont-init.d/code-server.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Studio Code Server
 # Sets up code-server.
diff --git a/vscode/rootfs/etc/cont-init.d/mosquitto.sh b/vscode/rootfs/etc/cont-init.d/mosquitto.sh
old mode 100644
new mode 100755
index d89061a..c3aef0e
--- a/vscode/rootfs/etc/cont-init.d/mosquitto.sh
+++ b/vscode/rootfs/etc/cont-init.d/mosquitto.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Studio Code Server
 # Pre-configures the Mosquitto clients, if the service is available
diff --git a/vscode/rootfs/etc/cont-init.d/mysql.sh b/vscode/rootfs/etc/cont-init.d/mysql.sh
old mode 100644
new mode 100755
index 03ce621..00a323b
--- a/vscode/rootfs/etc/cont-init.d/mysql.sh
+++ b/vscode/rootfs/etc/cont-init.d/mysql.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Studio Code Server
 # Pre-configures the MySQL clients, if the service is available
diff --git a/vscode/rootfs/etc/cont-init.d/user.sh b/vscode/rootfs/etc/cont-init.d/user.sh
old mode 100644
new mode 100755
index b9b58bd..5f0b883
--- a/vscode/rootfs/etc/cont-init.d/user.sh
+++ b/vscode/rootfs/etc/cont-init.d/user.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Studio Code Server
 # Persists user settings and installs custom user packages.
diff --git a/vscode/rootfs/etc/services.d/code/finish b/vscode/rootfs/etc/services.d/code/finish
old mode 100644
new mode 100755
index 91b7c3e..d83da7d
--- a/vscode/rootfs/etc/services.d/code/finish
+++ b/vscode/rootfs/etc/services.d/code/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Studio Code Server
 # Take down the S6 supervision tree when the code server fails
 # ==============================================================================
-if { s6-test ${1} -ne 0 }
-if { s6-test ${1} -ne 256 }
+if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
+  bashio::log.warning "code-server crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "code-server stopped, restarting..."
diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run
old mode 100644
new mode 100755
index eb16520..230d865
--- a/vscode/rootfs/etc/services.d/code/run
+++ b/vscode/rootfs/etc/services.d/code/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Studio Code Server
 # Runs the code server