diff --git a/docker/fake_frigate_run b/docker/fake_frigate_run
index a4415b616..7344f625b 100755
--- a/docker/fake_frigate_run
+++ b/docker/fake_frigate_run
@@ -2,7 +2,12 @@
 # shellcheck shell=bash
 # Start the fake Frigate service
 
+set -o errexit -o nounset -o pipefail
+
+# Tell S6-Overlay not to restart this service
+s6-svc -O .
+
 while true; do
-  echo "The fake Frigate service is running..."
+  echo "[INFO] The fake Frigate service is running..."
   sleep 5s
 done
diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/frigate/timeout-kill b/docker/rootfs/etc/s6-overlay/s6-rc.d/frigate/timeout-kill
new file mode 100644
index 000000000..6f4f41844
--- /dev/null
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/frigate/timeout-kill
@@ -0,0 +1 @@
+120000
diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/timeout-kill b/docker/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/timeout-kill
new file mode 100644
index 000000000..3a05c8b3e
--- /dev/null
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/timeout-kill
@@ -0,0 +1 @@
+30000
diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/nginx/timeout-kill b/docker/rootfs/etc/s6-overlay/s6-rc.d/nginx/timeout-kill
new file mode 100644
index 000000000..3a05c8b3e
--- /dev/null
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/nginx/timeout-kill
@@ -0,0 +1 @@
+30000