diff --git a/airsonos/Dockerfile b/airsonos/Dockerfile
index d1a9f5f..58e81bd 100755
--- a/airsonos/Dockerfile
+++ b/airsonos/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.3.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:6.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/airsonos/build.yaml b/airsonos/build.yaml
index bb9baa6..55a1bc3 100644
--- a/airsonos/build.yaml
+++ b/airsonos/build.yaml
@@ -1,9 +1,9 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.0
-  amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.0
-  armv7: ghcr.io/hassio-addons/debian-base/armv7:5.3.0
-  i386: ghcr.io/hassio-addons/debian-base/i386:5.3.0
+  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:6.0.0
+  amd64: ghcr.io/hassio-addons/debian-base/amd64:6.0.0
+  armv7: ghcr.io/hassio-addons/debian-base/armv7:6.0.0
+  i386: ghcr.io/hassio-addons/debian-base/i386:6.0.0
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev
diff --git a/airsonos/rootfs/etc/cont-init.d/airsonos.sh b/airsonos/rootfs/etc/cont-init.d/airsonos.sh
old mode 100644
new mode 100755
index 7015d04..4c34d0b
--- a/airsonos/rootfs/etc/cont-init.d/airsonos.sh
+++ b/airsonos/rootfs/etc/cont-init.d/airsonos.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: AirSonos
 # Checks latency settings before starting the AirSonos server
diff --git a/airsonos/rootfs/etc/services.d/airsonos/finish b/airsonos/rootfs/etc/services.d/airsonos/finish
old mode 100644
new mode 100755
index 0d9fbd9..0148ad3
--- a/airsonos/rootfs/etc/services.d/airsonos/finish
+++ b/airsonos/rootfs/etc/services.d/airsonos/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: AirSonos
 # Take down the S6 supervision tree when the AirSonos server fails
 # ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
+if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
+  bashio::log.warning "AirSonos crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "AirSonos stopped, restarting..."
diff --git a/airsonos/rootfs/etc/services.d/airsonos/run b/airsonos/rootfs/etc/services.d/airsonos/run
old mode 100644
new mode 100755
index a4a5bdf..871d248
--- a/airsonos/rootfs/etc/services.d/airsonos/run
+++ b/airsonos/rootfs/etc/services.d/airsonos/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: AirSonos
 # Runs the AirSonos server