diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile
index b6eb4284a..f82e6be65 100644
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -24,7 +24,8 @@ VOLUME [ "/data" ]
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 
 ##################
diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile
index f7661b52a..cc504b888 100644
--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -24,7 +24,8 @@ FROM $BUILD_FROM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ##################
 # 3 Install apps #
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index 87d019948..dae589ddf 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN \
diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index 819202ac7..621bb34fc 100644
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -32,7 +32,8 @@ COPY --from=vaultwarden /web-vault /opt/web-vault
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ##################
 # 3 Install apps #
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index cc23d3ec4..7f52e4569 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -24,7 +24,8 @@ FROM $BUILD_FROM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ENV BOOKSONIC_AIR_SETTINGS="/data"
 RUN \
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index cbab6d031..de1286c5b 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -25,7 +25,8 @@ ENV BASHIO_VERSION=1.29.1
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Allow UID and GID setting
 RUN sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile
index 8349ebc75..1f52a2d8d 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -25,7 +25,8 @@ ENV BASHIO_VERSION=1.29.1
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Allow UID and GID setting
 RUN sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index 39d571589..9d182987e 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -23,7 +23,8 @@ FROM coderaiser/cloudcmd:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ##################
 # 3 Install apps #
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index b2fb628ca..a0b0844df 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # Allow UID and GID setting
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 1555b1c8d..b9e08ea9c 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -23,7 +23,8 @@ FROM elasticsearch:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Data persistence
 # hadolint ignore=SC2016
diff --git a/emby/Dockerfile b/emby/Dockerfile
index c8ffdb13b..37b28f7a3 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile
index 463d11129..ddd1d2bc5 100644
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -24,7 +24,8 @@ FROM m4dm4rtig4n/enedisgateway2mqtt:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ##################
 # 3 Install apps #
diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile
index 718b2bae1..d8500690c 100644
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -24,7 +24,8 @@ FROM m4dm4rtig4n/enedisgateway2mqtt:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ##################
 # 3 Install apps #
diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile
index da682cc4f..457711504 100644
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -24,7 +24,8 @@ FROM hurlenko/filebrowser:v${BUILD_UPSTREAM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 
 ##################
diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile
index 357b3a7c8..9756a86cd 100644
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -24,7 +24,8 @@ FROM fireflyiii/core:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile
index 39965fc76..10f39f5d3 100644
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -25,7 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile
index 15a323ed0..04531fa6b 100644
--- a/fireflyiii_fints_importer/Dockerfile
+++ b/fireflyiii_fints_importer/Dockerfile
@@ -25,7 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 
 ##################
diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile
index 547d8185a..999297e2a 100644
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -23,7 +23,8 @@ FROM flaresolverr/flaresolverr:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 USER root
 
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index 26d6e4d7e..cac4104a7 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -24,7 +24,8 @@ FROM wiserain/flexget:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile
index efc6d42d9..31b2e21c3 100644
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -24,7 +24,8 @@ FROM yukulehe/gazpar2mqtt:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ENV TZ=Europe/Paris
 
diff --git a/grav/Dockerfile b/grav/Dockerfile
index 46e20c8b6..c97b8bb4e 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile
index 867a3ed96..275853938 100644
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ENV PGDATA=/config/addons_config/guacamole/postgres
 ENV GUACAMOLE_HOME=/config/addons_config/guacamole
diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile
index 13a29772b..41bdf12b5 100644
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -22,7 +22,8 @@ FROM troglobit/inadyn:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ARG BUILD_ARCH
 ENV LANG='C.UTF-8'\
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index 61ed38975..ba53a2974 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # use /data instead of /config for hass.io environment
 RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index 84dfb1714..82319c4ae 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Allow UID and GID setting
 RUN \
diff --git a/joal/Dockerfile b/joal/Dockerfile
index 2ea3a4a07..883317ae0 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -25,7 +25,8 @@ FROM anthonyraymond/joal:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Install Joal
 # spellcheck disable=SC2015
diff --git a/joplin/Dockerfile b/joplin/Dockerfile
index 6819a1198..5c6e853f0 100644
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -23,7 +23,8 @@ FROM florider89/joplin-server:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 USER root
 
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index fd22ebc6b..ac3dc4422 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/mealie/Dockerfile b/mealie/Dockerfile
index f22e4f066..11985ea41 100644
--- a/mealie/Dockerfile
+++ b/mealie/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Correct data path
 # hadolint ignore=DL4006
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index b6f17a16b..07b1f6ff6 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN sed -i "s|/config|/data|g" /etc/services.d/*/run \
     && sed -i "s|/config|/data|g" /etc/cont-init.d/* \
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 99b210930..0faf64e31 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -26,7 +26,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
 
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index 80ee492be..75f677819 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN sed -i "s|/config|/config/addons_config/nzbget|g" /etc/services.d/nzbget/run \
     && sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/30-config \
diff --git a/omada/Dockerfile b/omada/Dockerfile
index 45bf43d80..43e8b36e9 100644
--- a/omada/Dockerfile
+++ b/omada/Dockerfile
@@ -25,7 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN echo "Adding symlinks to entrypoint" \
     && sed -i \
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index e639bcd06..1fbde2b69 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # spellcheck disable=SC2015
 # hadolint ignore=SC2015,DL4006
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 4f6e8cbe7..06fc1211f 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -23,7 +23,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # hadolint ignore=DL4006
 RUN \
diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile
index 0931fa89c..e0df1e260 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -25,7 +25,8 @@ ENV BASHIO_VERSION=1.29.1
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/services.d/overseerr/run \
     && sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/cont-init.d/30-config \
diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile
index d587d55d2..7daa9ec15 100644
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng
 # spellcheck disable=SC2015
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index 80926fa4a..1ff7487e6 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # hadolint ignore=SC2015
 RUN \
diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile
index 202ee4ff6..e327264ae 100644
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -25,7 +25,8 @@ FROM photoprism/photoprism:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # Create directories
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 7f0208280..91baeb21e 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # Allow UID and GID setting
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 5e8a2bd07..5af2b0b1f 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile
index ba16fd3a4..ee36c5a40 100644
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ENV HOME=/config/addons_config/plex-data-manager
 
diff --git a/portainer/Dockerfile b/portainer/Dockerfile
index 6e0b3f4ba..2586ad59c 100644
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -23,7 +23,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index 67ed4849b..8601771df 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # Allow UID and GID setting
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index 2c4b03419..ddbb420f6 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index da129c4a1..3d0c8c5cd 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -25,7 +25,8 @@ ENV BASHIO_VERSION=0.14.3
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN sed -i "s|/config|/config/addons_config/radarr/readarr|g" /etc/services.d/readarr/run \
     && sed -i "s|/config|/config/addons_config/radarr/readarr|g" /etc/cont-init.d/30-config \
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index 9d96501e0..9e6ee4b14 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index 6016f0409..dad079741 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -25,7 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # hadolint ignore=DL4006
 RUN \
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 9e6aefab5..53cad1f72 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -26,7 +26,8 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # hadolint ignore=DL4006
 RUN \
diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile
index b27f00fcd..9d0a54c46 100644
--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/Dockerfile
@@ -25,7 +25,8 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # hadolint ignore=DL4006
 RUN \
diff --git a/seafile/Dockerfile b/seafile/Dockerfile
index 8096fa295..5da42cdde 100644
--- a/seafile/Dockerfile
+++ b/seafile/Dockerfile
@@ -25,7 +25,8 @@ ENV BASHIO_VERSION=1.29.1
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ENV LANG C.UTF-8
 
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index 268443362..eca1a6976 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -25,7 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile
index 2edfee592..04e9b8d4a 100644
--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -24,7 +24,8 @@ FROM $BUILD_FROM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ENV LANG C.UTF-8
 
diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile
index 8e6af243f..831cbcab9 100644
--- a/tandoor_recipes/Dockerfile
+++ b/tandoor_recipes/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 
 ##################
diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile
index 127da5242..3cf2e4a46 100644
--- a/tdarr/Dockerfile
+++ b/tdarr/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ##################
 # 3 Install apps #
diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile
index f527ab7c7..67ef70d8c 100644
--- a/teamspeak/Dockerfile
+++ b/teamspeak/Dockerfile
@@ -23,7 +23,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN mkdir -p /data \
     && chown -R 503:503 /data
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index e09e92021..a27c1c465 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # MOFIFY DATA PATH
 RUN sed -i "s|config|config/transmission|g" /etc/services.d/transmission/run \
diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile
index 62e60ce38..e02ca503a 100644
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -25,7 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # MOFIFY DATA PATH
 ENV CREATE_TUN_DEVICE=false
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index a41d85618..6db9d6aea 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -25,7 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 RUN \
     # Set config directory
diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile
index ae366c509..fa7b564c0 100644
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 ##################
 # 3 Install apps #
diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile
index b2e275a6d..4acf7dc2e 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}alpine-kde
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Allow UID and GID setting
 RUN sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index e1fb29f4e..392fad51b 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -24,7 +24,8 @@ FROM nathanvaughn/webtrees:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Global variables
 ENV WEBTREES_HOME="/data/webtrees"
diff --git a/wger/Dockerfile b/wger/Dockerfile
index 9b527c817..b25d7b116 100644
--- a/wger/Dockerfile
+++ b/wger/Dockerfile
@@ -23,7 +23,8 @@ FROM wger/devel:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 VOLUME [ "/data" ]
 
diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile
index 5f6d8b19a..800c932ea 100644
--- a/whoogle/Dockerfile
+++ b/whoogle/Dockerfile
@@ -24,7 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 USER root
 
diff --git a/xteve/Dockerfile b/xteve/Dockerfile
index a1e991f35..1ddd958cd 100644
--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -25,7 +25,8 @@ FROM $BUILD_FROM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 USER root
 
diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile
index 2c45bf6d7..e7d2f4ce3 100644
--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -25,7 +25,8 @@ FROM tritruongtr/zoneminder:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=10000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
+    S6_SERVICES_GRACETIME=300000
 
 # Change config location
 # hadolint ignore=DL4006