diff --git a/home-panel/Dockerfile b/home-panel/Dockerfile
index 8fc46d4..dd6a757 100755
--- a/home-panel/Dockerfile
+++ b/home-panel/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}
 
@@ -15,10 +15,10 @@ RUN \
         tar=1.34-r0 \
     \
     && apk add --no-cache \
-        nginx=1.20.2-r0 \
-        nodejs=16.14.0-r \
-        openssl=1.1.1n-r0 \
-        yarn=1.22.17-r0 \
+        nginx=1.22.0-r0 \
+        nodejs=16.15.0-r1 \
+        openssl=1.1.1o-r0 \
+        yarn=1.22.19-r0 \
     \
     && mkdir -p /opt/panel \
     && curl -L -s "https://github.com/timmo001/home-panel/releases/download/v2.11.6/home-panel.tar.gz" \
diff --git a/home-panel/build.yaml b/home-panel/build.yaml
index cb7c940..9f7b211 100644
--- a/home-panel/build.yaml
+++ b/home-panel/build.yaml
@@ -1,10 +1,10 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.0
-  amd64: ghcr.io/hassio-addons/base/amd64:11.1.0
-  armhf: ghcr.io/hassio-addons/base/armhf: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
+  armhf: ghcr.io/hassio-addons/base/armhf: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/home-panel/rootfs/etc/cont-init.d/nginx.sh b/home-panel/rootfs/etc/cont-init.d/nginx.sh
old mode 100644
new mode 100755
index 59f86cc..086abc2
--- a/home-panel/rootfs/etc/cont-init.d/nginx.sh
+++ b/home-panel/rootfs/etc/cont-init.d/nginx.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Home Panel
 # Configures NGINX for use with Home Panel
diff --git a/home-panel/rootfs/etc/cont-init.d/secrets.sh b/home-panel/rootfs/etc/cont-init.d/secrets.sh
old mode 100644
new mode 100755
index 89c9707..71f85fc
--- a/home-panel/rootfs/etc/cont-init.d/secrets.sh
+++ b/home-panel/rootfs/etc/cont-init.d/secrets.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Home Panel
 # This updates the internal auth secret for the API
diff --git a/home-panel/rootfs/etc/services.d/home-panel/finish b/home-panel/rootfs/etc/services.d/home-panel/finish
old mode 100644
new mode 100755
index c0e4f5d..1a03c1f
--- a/home-panel/rootfs/etc/services.d/home-panel/finish
+++ b/home-panel/rootfs/etc/services.d/home-panel/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Home Panel
 # Take down the S6 supervision tree when Home Panel 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 "Home Panel crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "Home Panel stopped, restarting..."
diff --git a/home-panel/rootfs/etc/services.d/home-panel/run b/home-panel/rootfs/etc/services.d/home-panel/run
old mode 100644
new mode 100755
index 269699e..c34962a
--- a/home-panel/rootfs/etc/services.d/home-panel/run
+++ b/home-panel/rootfs/etc/services.d/home-panel/run
@@ -1,9 +1,9 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Home Panel
 # Starts server to serve the app
 # ==============================================================================
-bashio::log.info "Run Home Panel.."
+bashio::log.info "Run Home Panel..."
 
 cd /opt/panel \
     || bashio::exit.nok "Could not change into app directory"
diff --git a/home-panel/rootfs/etc/services.d/nginx/finish b/home-panel/rootfs/etc/services.d/nginx/finish
old mode 100644
new mode 100755
index 28f667a..0efca51
--- a/home-panel/rootfs/etc/services.d/nginx/finish
+++ b/home-panel/rootfs/etc/services.d/nginx/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Home Panel
-# Take down the S6 supervision tree when Nginx fails
+# Take down the S6 supervision tree when NGINX 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 "NGINX crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "NGINX stopped, restarting..."
diff --git a/home-panel/rootfs/etc/services.d/nginx/run b/home-panel/rootfs/etc/services.d/nginx/run
old mode 100644
new mode 100755
index 984a0f3..5b20629
--- a/home-panel/rootfs/etc/services.d/nginx/run
+++ b/home-panel/rootfs/etc/services.d/nginx/run
@@ -1,10 +1,10 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Home Panel
-# Runs the Nginx daemon
+# Runs the NGINX daemon
 # ==============================================================================
 # Wait for Home Panel to become available
 bashio::net.wait_for 8234
 
-bashio::log.info "Starting NGinx..."
+bashio::log.info "Starting NGINX..."
 exec nginx