diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile
index f82e6be65..7cb30a384 100644
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -24,8 +24,8 @@ VOLUME [ "/data" ]
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 
 ##################
diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile
index cc504b888..bf69905e4 100644
--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -24,8 +24,8 @@ FROM $BUILD_FROM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ##################
 # 3 Install apps #
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index dae589ddf..ff71c7cda 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN \
diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index 5e1984711..40897651b 100644
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -32,8 +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=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ##################
 # 3 Install apps #
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index 7f52e4569..f1d6a3b79 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -24,8 +24,8 @@ FROM $BUILD_FROM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ENV BOOKSONIC_AIR_SETTINGS="/data"
 RUN \
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index de1286c5b..057858550 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -25,8 +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=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # 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 1f52a2d8d..48f9b8250 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -25,8 +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=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # 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 9d182987e..f19487502 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -23,8 +23,8 @@ FROM coderaiser/cloudcmd:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ##################
 # 3 Install apps #
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index a0b0844df..1a81b65b6 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # Allow UID and GID setting
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index b9e08ea9c..854adc06a 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -23,8 +23,8 @@ FROM elasticsearch:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # Data persistence
 # hadolint ignore=SC2016
diff --git a/emby/Dockerfile b/emby/Dockerfile
index 37b28f7a3..58a62d7c2 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile
index ddd1d2bc5..c647c078d 100644
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -24,8 +24,8 @@ FROM m4dm4rtig4n/enedisgateway2mqtt:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ##################
 # 3 Install apps #
diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile
index d8500690c..0305d8a63 100644
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -24,8 +24,8 @@ FROM m4dm4rtig4n/enedisgateway2mqtt:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ##################
 # 3 Install apps #
diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile
index da33bd407..adfb23380 100644
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -24,8 +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=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 
 ##################
diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile
index 9756a86cd..07d3ffec3 100644
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -24,8 +24,8 @@ FROM fireflyiii/core:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile
index 56ff24fb6..6f8ccd715 100644
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile
index 04531fa6b..7c6cded44 100644
--- a/fireflyiii_fints_importer/Dockerfile
+++ b/fireflyiii_fints_importer/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 
 ##################
diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile
index 999297e2a..cd2cae52a 100644
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -23,8 +23,8 @@ FROM flaresolverr/flaresolverr:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 USER root
 
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index 671094f17..1feae17d3 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -24,8 +24,8 @@ FROM wiserain/flexget:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile
index cc8d19fee..bcefe7f62 100644
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -24,8 +24,8 @@ FROM yukulehe/gazpar2mqtt:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ENV TZ=Europe/Paris
 
diff --git a/grav/Dockerfile b/grav/Dockerfile
index c97b8bb4e..f2a010dfd 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile
index 275853938..1967e9b5f 100644
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ENV PGDATA=/config/addons_config/guacamole/postgres
 ENV GUACAMOLE_HOME=/config/addons_config/guacamole
diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile
index 41bdf12b5..a4ff91787 100644
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -22,8 +22,8 @@ FROM troglobit/inadyn:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ARG BUILD_ARCH
 ENV LANG='C.UTF-8'\
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index ba53a2974..e6b38e656 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # 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/joal/Dockerfile b/joal/Dockerfile
index 883317ae0..7a0f14d6f 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -25,8 +25,8 @@ FROM anthonyraymond/joal:$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # Install Joal
 # spellcheck disable=SC2015
diff --git a/joplin/Dockerfile b/joplin/Dockerfile
index 5c6e853f0..1f4b43f6c 100644
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -23,8 +23,8 @@ FROM florider89/joplin-server:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 USER root
 
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index ac3dc4422..b7dd57553 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/mealie/Dockerfile b/mealie/Dockerfile
index cac46d406..f27b4fae2 100644
--- a/mealie/Dockerfile
+++ b/mealie/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # Correct data path
 # hadolint ignore=DL4006
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index 07b1f6ff6..990bcd2d5 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN sed -i "s|/config|/data|g" /etc/services.d/*/run \
     && sed -i "s|/config|/data|g" /etc/cont-init.d/* \
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index 75f677819..40904ddcc 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 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 43e8b36e9..a32b5fc21 100644
--- a/omada/Dockerfile
+++ b/omada/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN echo "Adding symlinks to entrypoint" \
     && sed -i \
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 1fbde2b69..12bdfc65c 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # spellcheck disable=SC2015
 # hadolint ignore=SC2015,DL4006
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 06fc1211f..4b82d20dc 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -23,8 +23,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # hadolint ignore=DL4006
 RUN \
diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile
index e0df1e260..3f8d9d81c 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -25,8 +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=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 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 7daa9ec15..5d00f39f3 100644
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng
 # spellcheck disable=SC2015
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index 1ff7487e6..e2eadc37d 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # hadolint ignore=SC2015
 RUN \
diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile
index c4965c1ab..64340aa49 100644
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -25,8 +25,8 @@ FROM photoprism/photoprism:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # Create directories
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 91baeb21e..15140d375 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # Allow UID and GID setting
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 5af2b0b1f..06b814295 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile
index ee36c5a40..8f3a0407c 100644
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ENV HOME=/config/addons_config/plex-data-manager
 
diff --git a/portainer/Dockerfile b/portainer/Dockerfile
index 215f5d805..9711624ea 100644
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -23,8 +23,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index 8601771df..d2cf6305c 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # Allow UID and GID setting
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 7be32f910..4f3f009a8 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}-$BUILD_UPSTREAM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # Environment variables
 ENV \
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index ddbb420f6..7ddfb7f02 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 3d0c8c5cd..0053015a0 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -25,8 +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=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 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 9e6ee4b14..8d0940092 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index dad079741..21572b879 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # hadolint ignore=DL4006
 RUN \
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 53cad1f72..efd528887 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # hadolint ignore=DL4006
 RUN \
diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile
index 9d0a54c46..348bb4bdc 100644
--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # hadolint ignore=DL4006
 RUN \
diff --git a/seafile/Dockerfile b/seafile/Dockerfile
index 5da42cdde..cd6432026 100644
--- a/seafile/Dockerfile
+++ b/seafile/Dockerfile
@@ -25,8 +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=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ENV LANG C.UTF-8
 
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index eca1a6976..89cdbb028 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # use /data instead of /config for hass.io environment
diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile
index 04e9b8d4a..270fb8a4f 100644
--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -24,8 +24,8 @@ FROM $BUILD_FROM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ENV LANG C.UTF-8
 
diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile
index 68d1ca595..a28222403 100644
--- a/tandoor_recipes/Dockerfile
+++ b/tandoor_recipes/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 
 ##################
diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile
index 3cf2e4a46..f3660b640 100644
--- a/tdarr/Dockerfile
+++ b/tdarr/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ##################
 # 3 Install apps #
diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile
index 67ef70d8c..34deea23f 100644
--- a/teamspeak/Dockerfile
+++ b/teamspeak/Dockerfile
@@ -23,8 +23,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN mkdir -p /data \
     && chown -R 503:503 /data
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index a27c1c465..1a958aabc 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # 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 e02ca503a..44282820c 100644
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # MOFIFY DATA PATH
 ENV CREATE_TUN_DEVICE=false
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 6db9d6aea..c11a1c66f 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 RUN \
     # Set config directory
diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile
index fa7b564c0..5fb3ee15e 100644
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 ##################
 # 3 Install apps #
diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile
index 4acf7dc2e..affd6ec77 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}alpine-kde
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # 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 2e6b86b6c..230d48036 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -24,8 +24,8 @@ FROM nathanvaughn/webtrees:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # Global variables
 ENV WEBTREES_HOME="/data/webtrees"
diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile
index 800c932ea..6124878e6 100644
--- a/whoogle/Dockerfile
+++ b/whoogle/Dockerfile
@@ -24,8 +24,8 @@ FROM ${BUILD_FROM}
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 USER root
 
diff --git a/xteve/Dockerfile b/xteve/Dockerfile
index 1ddd958cd..2fbd84eee 100644
--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -25,8 +25,8 @@ FROM $BUILD_FROM
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 USER root
 
diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile
index 66a719179..d64114c22 100644
--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -25,8 +25,8 @@ FROM tritruongtr/zoneminder:latest
 
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
-    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=300000 \
-    S6_SERVICES_GRACETIME=300000
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
 
 # Change config location
 # hadolint ignore=DL4006