diff --git a/spotify/Dockerfile b/spotify/Dockerfile
index f240129..a91d715 100755
--- a/spotify/Dockerfile
+++ b/spotify/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.1.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -10,9 +10,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN \
     apk add --no-cache --virtual .build-dependencies \
         build-base=0.5-r2 \
-        cargo=1.56.1-r0 \
-        git=2.34.2-r0 \
-        protobuf-dev=3.18.1-r1 \
+        cargo=1.60.0-r2 \
+        git=2.36.1-r0 \
+        protobuf-dev=3.18.1-r2 \
         pulseaudio-dev=15.0-r2 \
     \
     && apk add --no-cache \
diff --git a/spotify/build.yaml b/spotify/build.yaml
index 8403690..112f684 100644
--- a/spotify/build.yaml
+++ b/spotify/build.yaml
@@ -1,9 +1,9 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.0
-  amd64: ghcr.io/hassio-addons/base/amd64:11.1.0
-  armv7: ghcr.io/hassio-addons/base/armv7:11.1.0
-  i386: ghcr.io/hassio-addons/base/i386:11.1.0
+  aarch64: ghcr.io/hassio-addons/base/aarch64:12.0.0
+  amd64: ghcr.io/hassio-addons/base/amd64:12.0.0
+  armv7: ghcr.io/hassio-addons/base/armv7:12.0.0
+  i386: ghcr.io/hassio-addons/base/i386:12.0.0
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev
diff --git a/spotify/config.yaml b/spotify/config.yaml
index 8b300d3..aaf1823 100644
--- a/spotify/config.yaml
+++ b/spotify/config.yaml
@@ -12,6 +12,7 @@ arch:
   - i386
 host_network: true
 audio: true
+init: false
 options:
   name: Home Assistant
   bitrate: 160
diff --git a/spotify/rootfs/etc/services.d/spotifyd/finish b/spotify/rootfs/etc/services.d/spotifyd/finish
old mode 100644
new mode 100755
index afd3983..71d18de
--- a/spotify/rootfs/etc/services.d/spotifyd/finish
+++ b/spotify/rootfs/etc/services.d/spotifyd/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Spotify Connect
 # Take down the S6 supervision tree when spotifyd 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 "spotifyd crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "spotifyd stoped, restarting..."
diff --git a/spotify/rootfs/etc/services.d/spotifyd/run b/spotify/rootfs/etc/services.d/spotifyd/run
old mode 100644
new mode 100755
index b25b3e2..e77f9a4
--- a/spotify/rootfs/etc/services.d/spotifyd/run
+++ b/spotify/rootfs/etc/services.d/spotifyd/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Spotify Connect
 # Runs librespot