diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile
index d60b418b1..eeea03361 100644
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -25,8 +25,8 @@ VOLUME [ "/data" ]
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 
 ##################
@@ -64,6 +64,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile
index bbc52c809..d236318ff 100644
--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -64,6 +64,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile
index 01bea8508..52d3a8130 100644
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/autobrr"
@@ -90,6 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/baikal/Dockerfile b/baikal/Dockerfile
index 6fe220a79..0e09941bc 100644
--- a/baikal/Dockerfile
+++ b/baikal/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Image specific modifications
 # hadolint ignore=SC2015, SC2013, SC2086
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index dbb095d12..cc61e96da 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/bazarr"
@@ -87,6 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile
index 57735f187..f05ff7541 100644
--- a/binance-trading-bot/Dockerfile
+++ b/binance-trading-bot/Dockerfile
@@ -26,8 +26,8 @@ FROM $BUILD_FROM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -84,6 +84,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index 1378c72b2..6138ad1c3 100644
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -33,8 +33,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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -74,6 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index f856df7d5..7445803fd 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV BOOKSONIC_AIR_SETTINGS="/data"
 
@@ -92,6 +92,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile
index ba490e510..3765d7e37 100644
--- a/browserless_chrome/Dockerfile
+++ b/browserless_chrome/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index 5d24f228d..06973414f 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -27,8 +27,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/calibre"
@@ -93,6 +93,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile
index af09fe1a1..b6c073d29 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -27,8 +27,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN \
     echo '#!/bin/sh' > /usr/bin/xdg-icon-resource && chmod +x /usr/bin/xdg-icon-resource \
@@ -101,6 +101,7 @@ RUN if ! command -v sqlite3 >/dev/null 2>/dev/null; then (apt-get update && apt-
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index 23857714a..5fe83904f 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -25,8 +25,8 @@ FROM coderaiser/cloudcmd:${BUILD_UPSTREAM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -66,6 +66,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index f8b8382e3..40f6aa367 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/data"
@@ -87,6 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 1ae22d071..0bb2c9f6c 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -24,8 +24,8 @@ FROM elasticsearch:$BUILD_UPSTREAM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Data persistence
 # hadolint ignore=SC2016
@@ -76,6 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/emby/Dockerfile b/emby/Dockerfile
index 7b4e68cd1..e4b4d5c55 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/emby"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile
index 94543faca..1d278ace9 100644
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -25,8 +25,8 @@ FROM m4dm4rtig4n/myelectricaldata:$BUILD_UPSTREAM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -63,6 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile
index fa4f07613..ecfc1ac37 100644
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -25,8 +25,8 @@ FROM m4dm4rtig4n/myelectricaldata:latest-dev
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -63,6 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile
index f61efea16..d91d17d20 100644
--- a/epicgamesfree/Dockerfile
+++ b/epicgamesfree/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN sed -i "1a /./ha_entrypoint.sh" /usr/local/bin/docker-entrypoint.sh
 
@@ -65,6 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile
index 22c82e294..73ffd552b 100644
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -65,6 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile
index 065da8681..0e508a954 100644
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -25,8 +25,8 @@ FROM fireflyiii/core:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
@@ -74,6 +74,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile
index 90590d340..f018dfa25 100644
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 #ENV FIREFLY_III_PATH="/data/firefly"
 #WORKDIR $FIREFLY_III_PATH
@@ -70,6 +70,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile
index a81cbeebf..568a9384c 100644
--- a/fireflyiii_fints_importer/Dockerfile
+++ b/fireflyiii_fints_importer/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -64,6 +64,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile
index 32a68e014..bd203a740 100644
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -24,8 +24,8 @@ FROM flaresolverr/flaresolverr:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -64,6 +64,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index 3d9ff9798..7b22fd2ea 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -25,8 +25,8 @@ FROM wiserain/flexget:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -98,6 +98,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/free_games_claimer/Dockerfile b/free_games_claimer/Dockerfile
index 2785f167c..81de56ad1 100644
--- a/free_games_claimer/Dockerfile
+++ b/free_games_claimer/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -63,6 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile
index b30a87ddd..e92d07b04 100644
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -25,8 +25,8 @@ FROM yukulehe/gazpar2mqtt:$BUILD_UPSTREAM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV TZ=Europe/Paris
 
@@ -65,6 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/gitea/Dockerfile b/gitea/Dockerfile
index 3a8dd3979..1712ad968 100644
--- a/gitea/Dockerfile
+++ b/gitea/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -67,6 +67,7 @@ EXPOSE 22 3000
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/grav/Dockerfile b/grav/Dockerfile
index 4e8cf6c60..ca1d7d2a6 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/share/grav"
@@ -90,6 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile
index 3c5ba0acf..9e167eba2 100644
--- a/guacamole/Dockerfile
+++ b/guacamole/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV PGDATA=/config/addons_config/guacamole/postgres
 ENV GUACAMOLE_HOME=/config/addons_config/guacamole
@@ -95,6 +95,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/immich/Dockerfile b/immich/Dockerfile
index 5c0d278e9..bf5e66550 100644
--- a/immich/Dockerfile
+++ b/immich/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/immich"
@@ -105,6 +105,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile
index f8ee0b9d4..f38230b32 100644
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -23,8 +23,8 @@ FROM troglobit/inadyn:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ARG BUILD_ARCH
 ENV LANG='C.UTF-8'\
@@ -88,6 +88,7 @@ RUN apk add --no-cache \
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index ca3873af4..fc1955490 100644
--- a/jackett/Dockerfile
+++ b/jackett/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/Jackett"
@@ -89,6 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index 95afd1f81..c4b3dcd55 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -25,8 +25,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=0 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh \
+    S6_SERVICES_GRACETIME=0
+ \
     S6_READ_ONLY_ROOT=1
 
 # Global LSIO modifications
@@ -94,6 +94,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/jellyseerr/Dockerfile b/jellyseerr/Dockerfile
index c4bcd4845..192e4af66 100644
--- a/jellyseerr/Dockerfile
+++ b/jellyseerr/Dockerfile
@@ -26,8 +26,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/jellyseerr"
@@ -71,6 +71,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/joal/Dockerfile b/joal/Dockerfile
index a5fbb5794..d7ad8cc25 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -26,8 +26,8 @@ FROM anthonyraymond/joal:$BUILD_UPSTREAM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Install Joal
 # spellcheck disable=SC2015
@@ -76,6 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/joplin/Dockerfile b/joplin/Dockerfile
index 55a30feb1..2f273eeae 100644
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -24,8 +24,8 @@ FROM florider89/joplin-server:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -70,6 +70,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index c834e4563..b2c21da6b 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/lidarr"
@@ -89,6 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/mealie/Dockerfile b/mealie/Dockerfile
index 0938ba186..6f03e6b17 100644
--- a/mealie/Dockerfile
+++ b/mealie/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV FRONTEND_PORT=9925
 
@@ -71,6 +71,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index 585b2059b..263d68ba5 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/data"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index b742b79d1..8a4ead251 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -28,8 +28,8 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Specific modifications
 ARG CONFIGLOCATION="/share/nextcloud"
@@ -111,6 +111,7 @@ VOLUME ["/share", "/ssl", "/data", "/media"]
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index 7eb97d4fb..b6ff8b69d 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/nzbget"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/omada/Dockerfile b/omada/Dockerfile
index 4f15a63b8..7e8426153 100644
--- a/omada/Dockerfile
+++ b/omada/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN echo "Adding symlinks to entrypoint" \
     && sed -i \
@@ -71,6 +71,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile
index fb39fd357..706f1c779 100644
--- a/omada_v3/Dockerfile
+++ b/omada_v3/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN echo "Adding symlinks to entrypoint" \
     && sed -i \
@@ -72,6 +72,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 94ad18001..fcb61a687 100644
--- a/ombi/Dockerfile
+++ b/ombi/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/ombi"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 5ed8afff0..9d732bb41 100644
--- a/organizr/Dockerfile
+++ b/organizr/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/data/organizr"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile
index 4ea900ad0..671f6bf08 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -26,8 +26,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/overseerr"
@@ -87,6 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile
index 93e52452a..0bf0219ba 100644
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Add custom scripts
 #RUN \
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index 1cf53592f..453ed62e6 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Image specific
 RUN \
@@ -96,6 +96,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile
index d7b6d2c6a..ed284cf36 100644
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -26,8 +26,8 @@ FROM photoprism/photoprism:preview
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV workdir="/data/photoprism" \
     HOME="/data/photoprism"
@@ -75,6 +75,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 99ecdd971..af820be6c 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/piwigo"
@@ -88,6 +88,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 1ddc4b61c..b6a45ec6e 100644
--- a/plex/Dockerfile
+++ b/plex/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Image specific modifications
 # hadolint ignore=SC2016,SC2086
@@ -98,6 +98,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile
index 113695b92..c3bfe5e2f 100644
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV HOME=/config/addons_config/plex-meta-manager
 
@@ -94,6 +94,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/portainer/Dockerfile b/portainer/Dockerfile
index e80c70be1..42ddb5a22 100644
--- a/portainer/Dockerfile
+++ b/portainer/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile
index 494c9adc7..fab74be0a 100644
--- a/portainer_agent/Dockerfile
+++ b/portainer_agent/Dockerfile
@@ -34,8 +34,8 @@ COPY --from=original_agent /app /app
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -72,6 +72,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 33caf2db5..24f82ffc4 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -25,8 +25,8 @@ FROM postgres:15-alpine
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN \
     # Correct for access
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index a26234506..ffc07505c 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/prowlarr"
@@ -89,6 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index b36559da5..7e8b43270 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Environment variables
 ENV \
@@ -124,6 +124,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index 790d4a364..96d1f88f2 100644
--- a/radarr/Dockerfile
+++ b/radarr/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/radarr"
@@ -90,6 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 1d34e02e8..137bab07f 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -26,8 +26,8 @@ ENV BASHIO_VERSION=0.14.3
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/readarr"
@@ -87,6 +87,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index 1899dc2c0..58bd52673 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/data"
@@ -89,6 +89,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index e0985a30e..2eec10bd7 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # hadolint ignore=SC2015,DL4006,SC2013,SC2086
 RUN \
@@ -109,6 +109,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile
index 56402cbdc..ce316da9c 100644
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/sabnzbd"
@@ -86,6 +86,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 627ecd54d..57e216a0f 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -66,6 +66,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile
index 627ecd54d..57e216a0f 100644
--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -66,6 +66,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/seafile/Dockerfile b/seafile/Dockerfile
index 837f8c357..be5d30cff 100644
--- a/seafile/Dockerfile
+++ b/seafile/Dockerfile
@@ -26,8 +26,8 @@ ENV BASHIO_VERSION=1.29.1
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV LANG C.UTF-8
 
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index 62e49d2d0..3d04db2f0 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config/addons_config/sonarr"
@@ -90,6 +90,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/sponsorblockcast/Dockerfile b/sponsorblockcast/Dockerfile
index ee97a1da2..8b420b5d0 100644
--- a/sponsorblockcast/Dockerfile
+++ b/sponsorblockcast/Dockerfile
@@ -25,8 +25,8 @@ VOLUME [ "/data" ]
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -65,6 +65,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile
index 90ea34126..8eca0d8e3 100644
--- a/spotweb/Dockerfile
+++ b/spotweb/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV LANG C.UTF-8
 
@@ -121,6 +121,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile
index 07acea548..75e22946d 100644
--- a/tandoor_recipes/Dockerfile
+++ b/tandoor_recipes/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -62,6 +62,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile
index 42fd23b73..6556ba45a 100644
--- a/tdarr/Dockerfile
+++ b/tdarr/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ##################
 # 3 Install apps #
@@ -63,6 +63,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile
index 46552804b..1c4d05990 100644
--- a/teamspeak/Dockerfile
+++ b/teamspeak/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN mkdir -p /data \
     && chown -R 503:503 /data
@@ -69,6 +69,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index d661c46a6..d58f782ed 100644
--- a/transmission/Dockerfile
+++ b/transmission/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Modify image
 
@@ -98,6 +98,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile
index 31230b59e..25774ad6b 100644
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # MOFIFY DATA PATH
 ENV CREATE_TUN_DEVICE=false \
@@ -91,6 +91,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 31f4ce9ad..b1f939feb 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -26,8 +26,8 @@ FROM ${BUILD_FROM}
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 RUN \
     # Set default directory
@@ -99,6 +99,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile
index 23e5e5a09..3e438e75d 100644
--- a/unpackerr/Dockerfile
+++ b/unpackerr/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global LSIO modifications
 ARG CONFIGLOCATION="/config"
@@ -85,6 +85,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile
index a81b73db3..7e698eb3e 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # load volume
 VOLUME [ "/sys/fs/cgroup" ]
@@ -95,6 +95,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index 4e36cf215..2b1f31aaa 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -25,8 +25,8 @@ FROM nathanvaughn/webtrees:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Global variables
 ENV WEBTREES_HOME="/data/webtrees"
@@ -76,6 +76,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/wger/Dockerfile b/wger/Dockerfile
index e962a10cc..7e0bbc817 100644
--- a/wger/Dockerfile
+++ b/wger/Dockerfile
@@ -25,8 +25,8 @@ FROM wger/devel:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 ENV SYNC_EXERCISES_ON_STARTUP=True \
     DOWNLOAD_EXERCISE_IMAGES_ON_STARTUP=True \
@@ -73,6 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile
index b19a3d466..4b29183c1 100644
--- a/whoogle/Dockerfile
+++ b/whoogle/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=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/xteve/Dockerfile b/xteve/Dockerfile
index 31bd95b05..6296283d9 100644
--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -26,8 +26,8 @@ FROM $BUILD_FROM
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 USER root
 
@@ -68,6 +68,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3
diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile
index e15e732d3..49d4714bc 100644
--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -26,8 +26,8 @@ FROM tritruongtr/zoneminder:latest
 # Set S6 wait time
 ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
-    S6_SERVICES_GRACETIME=0 \
-    S6_STAGE2_HOOK=/ha_entrypoint.sh
+    S6_SERVICES_GRACETIME=0
+
 
 # Change config location
 # hadolint ignore=DL4006
@@ -73,6 +73,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 ################
 
 # Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
 ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Corrects permissions for s6 v3