diff --git a/rootfs/etc/s6-overlay/scripts/lighttpd b/rootfs/etc/s6-overlay/scripts/lighttpd
index 80530d3..d9d7629 100755
--- a/rootfs/etc/s6-overlay/scripts/lighttpd
+++ b/rootfs/etc/s6-overlay/scripts/lighttpd
@@ -16,11 +16,11 @@ if [[ -z "$DISABLE_WEBAPP" ]]; then
     set -eo pipefail
 
     #shellcheck disable=SC2016
-    s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args s6-setuidgid nobody /usr/sbin/lighttpd \
+    exec s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args s6-setuidgid nobody /usr/sbin/lighttpd \
         -f /etc/lighttpd/lighttpd.conf \
         -D
 
 # If webapp disabled, sleep forever
 else
-    sleep infinity
+    exec sleep infinity
 fi
diff --git a/rootfs/etc/s6-overlay/scripts/skyaware978 b/rootfs/etc/s6-overlay/scripts/skyaware978
index 0e65579..fab23e1 100755
--- a/rootfs/etc/s6-overlay/scripts/skyaware978
+++ b/rootfs/etc/s6-overlay/scripts/skyaware978
@@ -28,4 +28,4 @@ fi
 
 "${s6wrap[@]}" echo "invoking: $SKY_BIN ${SKY_ARGS[*]}"
 # shellcheck disable=SC2068
-"${s6wrap[@]}" $SKY_BIN ${SKY_ARGS[@]}
+exec "${s6wrap[@]}" $SKY_BIN ${SKY_ARGS[@]}
diff --git a/rootfs/etc/s6-overlay/scripts/stats b/rootfs/etc/s6-overlay/scripts/stats
index 4ccbaa2..6d4e159 100755
--- a/rootfs/etc/s6-overlay/scripts/stats
+++ b/rootfs/etc/s6-overlay/scripts/stats
@@ -13,4 +13,4 @@ fi
 sleep 5
 
 # shellcheck disable=SC2016
-s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args python3 -u /scripts/stats.py
+exec s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args python3 -u /scripts/stats.py
diff --git a/rootfs/etc/s6-overlay/scripts/telegraf b/rootfs/etc/s6-overlay/scripts/telegraf
index 2023638..90bfd57 100755
--- a/rootfs/etc/s6-overlay/scripts/telegraf
+++ b/rootfs/etc/s6-overlay/scripts/telegraf
@@ -16,5 +16,5 @@ if [[ -n "$INFLUXDBURL" ]] || [ -n "$ENABLE_PROMETHEUS" ]; then
     --config-directory /etc/telegraf/telegraf.d \
     | grep -v "Error in plugin"
 else
-  sleep infinity
+  exec sleep infinity
 fi
diff --git a/rootfs/etc/s6-overlay/scripts/telegraf_socat b/rootfs/etc/s6-overlay/scripts/telegraf_socat
index 31db2cd..47c51c8 100755
--- a/rootfs/etc/s6-overlay/scripts/telegraf_socat
+++ b/rootfs/etc/s6-overlay/scripts/telegraf_socat
@@ -7,7 +7,7 @@ set -eo pipefail
 
 # If the telegraf binary is not present, then do nothing:
 if [[ ! -f /usr/bin/telegraf ]]; then
-  sleep infinity
+  exec sleep infinity
 fi
 
 if [ -z "$INFLUXDB_SKIP_AIRCRAFT" ] && { [ -n "$INFLUXDBURL" ] || [ -n "$ENABLE_PROMETHEUS" ]; } then
@@ -23,8 +23,8 @@ if [ -z "$INFLUXDB_SKIP_AIRCRAFT" ] && { [ -n "$INFLUXDBURL" ] || [ -n "$ENABLE_
   SOCAT_CMD+=("TCP:localhost:33979")
 
   # shellcheck disable=SC2016
-  s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args "${SOCAT_BIN}" "${SOCAT_CMD[@]}"
+  exec s6wrap --quiet --timestamps --prepend="$(basename "$0")" --args "${SOCAT_BIN}" "${SOCAT_CMD[@]}"
 
 else
-  sleep infinity
+  exec sleep infinity
 fi