diff --git a/thelounge/Dockerfile b/thelounge/Dockerfile
index 518ed0a..a55762f 100644
--- a/thelounge/Dockerfile
+++ b/thelounge/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.1.2
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/thelounge/build.yaml b/thelounge/build.yaml
index b7f18bc..9f7b211 100644
--- a/thelounge/build.yaml
+++ b/thelounge/build.yaml
@@ -1,10 +1,10 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.2
-  amd64: ghcr.io/hassio-addons/base/amd64:11.1.2
-  armhf: ghcr.io/hassio-addons/base/armhf:11.1.2
-  armv7: ghcr.io/hassio-addons/base/armv7:11.1.2
-  i386: ghcr.io/hassio-addons/base/i386:11.1.2
+  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/thelounge/config.yaml b/thelounge/config.yaml
index d2b29e8..b58f7e7 100644
--- a/thelounge/config.yaml
+++ b/thelounge/config.yaml
@@ -13,6 +13,7 @@ arch:
   - i386
 ingress: true
 ingress_stream: true
+init: false
 panel_icon: mdi:chat
 ports:
   80/tcp: null
diff --git a/thelounge/rootfs/etc/cont-init.d/nginx.sh b/thelounge/rootfs/etc/cont-init.d/nginx.sh
old mode 100644
new mode 100755
index 9159565..09b8cc7
--- a/thelounge/rootfs/etc/cont-init.d/nginx.sh
+++ b/thelounge/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: The Lounge
 # Configures NGINX for use with thelounge
diff --git a/thelounge/rootfs/etc/cont-init.d/thelounge.sh b/thelounge/rootfs/etc/cont-init.d/thelounge.sh
old mode 100644
new mode 100755
index 38aad9f..fe29a5a
--- a/thelounge/rootfs/etc/cont-init.d/thelounge.sh
+++ b/thelounge/rootfs/etc/cont-init.d/thelounge.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: The Lounge
 # This adds the default user and installs any requested themes
diff --git a/thelounge/rootfs/etc/services.d/nginx/finish b/thelounge/rootfs/etc/services.d/nginx/finish
old mode 100644
new mode 100755
index 404eaa4..b168381
--- a/thelounge/rootfs/etc/services.d/nginx/finish
+++ b/thelounge/rootfs/etc/services.d/nginx/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: The Lounge
 # 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/thelounge/rootfs/etc/services.d/nginx/run b/thelounge/rootfs/etc/services.d/nginx/run
old mode 100644
new mode 100755
index 1baabb1..5ebdd9a
--- a/thelounge/rootfs/etc/services.d/nginx/run
+++ b/thelounge/rootfs/etc/services.d/nginx/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: The Lounge
 # Runs the Nginx daemon
diff --git a/thelounge/rootfs/etc/services.d/thelounge/finish b/thelounge/rootfs/etc/services.d/thelounge/finish
old mode 100644
new mode 100755
index f226fed..3e68fc4
--- a/thelounge/rootfs/etc/services.d/thelounge/finish
+++ b/thelounge/rootfs/etc/services.d/thelounge/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: The Lounge
 # Take down the S6 supervision tree when the 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 "The Lounge crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "The Lounge stopped, restarting..."
diff --git a/thelounge/rootfs/etc/services.d/thelounge/run b/thelounge/rootfs/etc/services.d/thelounge/run
old mode 100644
new mode 100755
index f765dd0..41eae8b
--- a/thelounge/rootfs/etc/services.d/thelounge/run
+++ b/thelounge/rootfs/etc/services.d/thelounge/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: The Lounge
 # Runs The Lounge server