diff --git a/Dockerfile b/Dockerfile
index 647c2b8ac0723f3f11f839f998b607550d3cb8cd..4646e9f01f1a7a012f96f450bd1f2f2332602219 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,15 @@
 ARG BUILD_FROM
 FROM ${BUILD_FROM}
 
+ENV \
+    S6_SERVICES_GRACETIME=60000
+
 WORKDIR /usr/src
 
 ## Setup Home Assistant
 COPY . homeassistant/
-RUN pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
+RUN \
+    pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
         -r homeassistant/requirements_all.txt -c homeassistant/homeassistant/package_constraints.txt \
     && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
         -e ./homeassistant \
diff --git a/rootfs/etc/services.d/home-assistant/finish b/rootfs/etc/services.d/home-assistant/finish
index 3afed0ca8d8ca9b4b774f3cc30dea27ebe44f024..d039fc04c86fdbab0b44249e288e326b473a15c9 100644
--- a/rootfs/etc/services.d/home-assistant/finish
+++ b/rootfs/etc/services.d/home-assistant/finish
@@ -1,7 +1,8 @@
-#!/usr/bin/execlineb -S0
+#!/usr/bin/execlineb -S1
 # ==============================================================================
 # Take down the S6 supervision tree when Home Assistant fails
 # ==============================================================================
 if { s6-test ${1} -ne 100 }
+if { s6-test ${1} -ne 256 }
 
-s6-svscanctl -t /var/run/s6/services
\ No newline at end of file
+s6-svscanctl -t /var/run/s6/services