diff --git a/chrony/Dockerfile b/chrony/Dockerfile
index 46ccb97..fd67461 100644
--- a/chrony/Dockerfile
+++ b/chrony/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}
 
@@ -9,7 +9,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # hadolint ignore=DL3003
 RUN \
     apk add --no-cache \
-        chrony=4.1-r0
+        chrony=4.2-r0
 
 # Copy root filesystem
 COPY rootfs /
diff --git a/chrony/build.yaml b/chrony/build.yaml
index cb7c940..9f7b211 100644
--- a/chrony/build.yaml
+++ b/chrony/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/chrony/rootfs/etc/cont-init.d/chrony.sh b/chrony/rootfs/etc/cont-init.d/chrony.sh
old mode 100644
new mode 100755
index 1c22dbc..03ac74e
--- a/chrony/rootfs/etc/cont-init.d/chrony.sh
+++ b/chrony/rootfs/etc/cont-init.d/chrony.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: chrony
 # Configures chrony
diff --git a/chrony/rootfs/etc/services.d/chronyd/finish b/chrony/rootfs/etc/services.d/chronyd/finish
old mode 100644
new mode 100755
index 8ae5998..e7920df
--- a/chrony/rootfs/etc/services.d/chronyd/finish
+++ b/chrony/rootfs/etc/services.d/chronyd/finish
@@ -1,9 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: chrony
 # Take down the S6 supervision tree when chrony 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 "chrony crashed, halting add-on"
+  /run/s6/basedir/bin/halt
+fi
 
-s6-svscanctl -t /var/run/s6/services
+bashio::log.info "chrony stopped, restarting..."
diff --git a/chrony/rootfs/etc/services.d/chronyd/run b/chrony/rootfs/etc/services.d/chronyd/run
old mode 100644
new mode 100755
index 58806c2..91a7ded
--- a/chrony/rootfs/etc/services.d/chronyd/run
+++ b/chrony/rootfs/etc/services.d/chronyd/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: chrony
 # Runs chrony daemon