diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base
new file mode 100644
index 0000000..e69de29
diff --git a/thelounge/rootfs/etc/cont-init.d/nginx.sh b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
similarity index 96%
rename from thelounge/rootfs/etc/cont-init.d/nginx.sh
rename to thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
index 09b8cc7..ece552f 100755
--- a/thelounge/rootfs/etc/cont-init.d/nginx.sh
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: The Lounge
 # Configures NGINX for use with thelounge
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
@@ -0,0 +1 @@
+oneshot
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
new file mode 100644
index 0000000..b3b5b49
--- /dev/null
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-nginx/run
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/dependencies.d/base b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/dependencies.d/base
new file mode 100644
index 0000000..e69de29
diff --git a/thelounge/rootfs/etc/cont-init.d/thelounge.sh b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/run
similarity index 98%
rename from thelounge/rootfs/etc/cont-init.d/thelounge.sh
rename to thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/run
index fe29a5a..d8dc60d 100755
--- a/thelounge/rootfs/etc/cont-init.d/thelounge.sh
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/run
@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: The Lounge
 # This adds the default user and installs any requested themes
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/type b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/type
@@ -0,0 +1 @@
+oneshot
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/up b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/up
new file mode 100644
index 0000000..fed68a3
--- /dev/null
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/init-thelounge/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-thelounge/run
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx
new file mode 100644
index 0000000..e69de29
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/thelounge b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/thelounge
new file mode 100644
index 0000000..e69de29
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
new file mode 100755
index 0000000..e6cbadc
--- /dev/null
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
@@ -0,0 +1,27 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: The Lounge
+# Take down the S6 supervision tree when Nginx fails
+# ==============================================================================
+declare exit_code
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+readonly service="NGINX"
+
+bashio::log.info \
+  "Service ${service} exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+fi
diff --git a/thelounge/rootfs/etc/services.d/nginx/run b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
similarity index 94%
rename from thelounge/rootfs/etc/services.d/nginx/run
rename to thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
index 5ebdd9a..2ed345a 100755
--- a/thelounge/rootfs/etc/services.d/nginx/run
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/run
@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: The Lounge
 # Runs the Nginx daemon
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/type b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/nginx/type
@@ -0,0 +1 @@
+longrun
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/dependencies.d/init-adguard b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/dependencies.d/init-adguard
new file mode 100644
index 0000000..e69de29
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/finish b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/finish
new file mode 100755
index 0000000..dfc2d2a
--- /dev/null
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/finish
@@ -0,0 +1,27 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: The Lounge
+# Take down the S6 supervision tree when the server fails
+# ==============================================================================
+declare exit_code
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+readonly service="The Lounge"
+
+bashio::log.info \
+  "Service ${service} exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+fi
diff --git a/thelounge/rootfs/etc/services.d/thelounge/run b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/run
similarity index 95%
rename from thelounge/rootfs/etc/services.d/thelounge/run
rename to thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/run
index 41eae8b..aae897f 100755
--- a/thelounge/rootfs/etc/services.d/thelounge/run
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/run
@@ -1,4 +1,5 @@
 #!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Home Assistant Community Add-on: The Lounge
 # Runs The Lounge server
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/type b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/thelounge/type
@@ -0,0 +1 @@
+longrun
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx
new file mode 100644
index 0000000..e69de29
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-thelounge b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-thelounge
new file mode 100644
index 0000000..e69de29
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
new file mode 100644
index 0000000..e69de29
diff --git a/thelounge/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/thelounge b/thelounge/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/thelounge
new file mode 100644
index 0000000..e69de29
diff --git a/thelounge/rootfs/etc/services.d/nginx/finish b/thelounge/rootfs/etc/services.d/nginx/finish
deleted file mode 100755
index b168381..0000000
--- a/thelounge/rootfs/etc/services.d/nginx/finish
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/command/with-contenv bashio
-# ==============================================================================
-# Home Assistant Community Add-on: The Lounge
-# Take down the S6 supervision tree when Nginx fails
-# ==============================================================================
-if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
-  bashio::log.warning "NGINX crashed, halting add-on"
-  /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "NGINX stopped, restarting..."
diff --git a/thelounge/rootfs/etc/services.d/thelounge/finish b/thelounge/rootfs/etc/services.d/thelounge/finish
deleted file mode 100755
index 3e68fc4..0000000
--- a/thelounge/rootfs/etc/services.d/thelounge/finish
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/command/with-contenv bashio
-# ==============================================================================
-# Home Assistant Community Add-on: The Lounge
-# Take down the S6 supervision tree when the server fails
-# ==============================================================================
-if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
-  bashio::log.warning "The Lounge crashed, halting add-on"
-  /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "The Lounge stopped, restarting..."