diff --git a/traccar/Dockerfile b/traccar/Dockerfile
index f26adbf..c5b7bf0 100755
--- a/traccar/Dockerfile
+++ b/traccar/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}
 
@@ -15,9 +15,9 @@ WORKDIR /opt/traccar
 RUN \
     apk add --no-cache \
         mariadb-client=10.6.8-r0 \
-        nginx=1.20.2-r1 \
-        nss=3.76.1-r0 \
-        openjdk11-jre-headless=11.0.15_p10-r0 \
+        nginx=1.22.0-r0 \
+        nss=3.78.1-r0 \
+        openjdk11-jre-headless=11.0.15_p10-r1 \
         xmlstarlet=1.6.1-r0 \
     \
     && curl -J -L -o /tmp/traccar.zip \
diff --git a/traccar/build.yaml b/traccar/build.yaml
index c0f1892..df90103 100644
--- a/traccar/build.yaml
+++ b/traccar/build.yaml
@@ -1,7 +1,7 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.2
-  amd64: ghcr.io/hassio-addons/base/amd64:11.1.2
+  aarch64: ghcr.io/hassio-addons/base/aarch64:12.0.0
+  amd64: ghcr.io/hassio-addons/base/amd64:12.0.0
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev
diff --git a/traccar/rootfs/etc/cont-init.d/mysql.sh b/traccar/rootfs/etc/cont-init.d/mysql.sh
old mode 100644
new mode 100755
index 7b5a440..f3d3c29
--- a/traccar/rootfs/etc/cont-init.d/mysql.sh
+++ b/traccar/rootfs/etc/cont-init.d/mysql.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Traccar
 # Pre-configures the MySQL clients, if the service is available
diff --git a/traccar/rootfs/etc/cont-init.d/nginx.sh b/traccar/rootfs/etc/cont-init.d/nginx.sh
old mode 100644
new mode 100755
index b84c861..410d691
--- a/traccar/rootfs/etc/cont-init.d/nginx.sh
+++ b/traccar/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: Traccar
 # Configures NGINX for use with the Traccar server
diff --git a/traccar/rootfs/etc/cont-init.d/traccar.sh b/traccar/rootfs/etc/cont-init.d/traccar.sh
old mode 100644
new mode 100755
index f4eec80..c1f1ebc
--- a/traccar/rootfs/etc/cont-init.d/traccar.sh
+++ b/traccar/rootfs/etc/cont-init.d/traccar.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Traccar
 # Ensures the user configuration file is present
diff --git a/traccar/rootfs/etc/services.d/nginx/finish b/traccar/rootfs/etc/services.d/nginx/finish
old mode 100644
new mode 100755
index 18ece6c..c73e670
--- a/traccar/rootfs/etc/services.d/nginx/finish
+++ b/traccar/rootfs/etc/services.d/nginx/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Traccar
-# 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/traccar/rootfs/etc/services.d/nginx/run b/traccar/rootfs/etc/services.d/nginx/run
old mode 100644
new mode 100755
index 1188654..b82360f
--- a/traccar/rootfs/etc/services.d/nginx/run
+++ b/traccar/rootfs/etc/services.d/nginx/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Traccar
 # Runs the Nginx daemon
diff --git a/traccar/rootfs/etc/services.d/traccar/finish b/traccar/rootfs/etc/services.d/traccar/finish
old mode 100644
new mode 100755
index 1c3bd93..e071428
--- a/traccar/rootfs/etc/services.d/traccar/finish
+++ b/traccar/rootfs/etc/services.d/traccar/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Traccar
 # Take down the S6 supervision tree when the Traccar daemon 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 "Traccar crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "Traccar stopped, restarting..."
diff --git a/traccar/rootfs/etc/services.d/traccar/run b/traccar/rootfs/etc/services.d/traccar/run
old mode 100644
new mode 100755
index 060a482..4b16959
--- a/traccar/rootfs/etc/services.d/traccar/run
+++ b/traccar/rootfs/etc/services.d/traccar/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Traccar
 # Runs the Traccar daemon