diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile
index 7118b0fee..dbbf41313 100644
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -64,6 +64,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 # Entrypoint logic
diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile
index a4d623c45..0c595b0d8 100644
--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -64,6 +64,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile
index be08c8a7a..b4a2357a3 100644
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -71,6 +71,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #WORKDIR /
diff --git a/baikal/Dockerfile b/baikal/Dockerfile
index 38b05088c..6e4585be3 100644
--- a/baikal/Dockerfile
+++ b/baikal/Dockerfile
@@ -67,6 +67,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 WORKDIR "/data"
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index 6cdad5d16..6fae7c066 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -68,6 +68,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile
index 500b7db74..8105f87cd 100644
--- a/binance-trading-bot/Dockerfile
+++ b/binance-trading-bot/Dockerfile
@@ -84,6 +84,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 VOLUME [ "/data" ]
diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index d05565b4a..0313f255c 100644
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -74,6 +74,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 RUN chmod 777 /etc/services.d/*/*
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index 5feb69143..e40f67b8b 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -74,6 +74,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile
index fa8eb9fc0..95a53fc5a 100644
--- a/browserless_chrome/Dockerfile
+++ b/browserless_chrome/Dockerfile
@@ -65,6 +65,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 RUN sed -i "2a /./ha_entrypoint.sh" start.sh
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index 618e38b89..40592a034 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -77,6 +77,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile
index 751d72c86..952bf5aa2 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -83,6 +83,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index f93be690c..9915f339b 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -65,6 +65,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ENTRYPOINT [ "/ha_entrypoint.sh" ]
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index 70464c687..ebbef750b 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -68,6 +68,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 48c052cf3..f87c2c370 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -76,6 +76,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/emby/Dockerfile b/emby/Dockerfile
index 4e36d45e9..822927873 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -67,6 +67,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile
index c3adcb2fa..8f1f3837e 100644
--- a/enedisgateway2mqtt/Dockerfile
+++ b/enedisgateway2mqtt/Dockerfile
@@ -63,6 +63,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile
index 074b98d5a..575c430b9 100644
--- a/enedisgateway2mqtt_dev/Dockerfile
+++ b/enedisgateway2mqtt_dev/Dockerfile
@@ -63,6 +63,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile
index 548b18b9b..530676f34 100644
--- a/epicgamesfree/Dockerfile
+++ b/epicgamesfree/Dockerfile
@@ -65,6 +65,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile
index 95390882f..538aa443f 100644
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -65,6 +65,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 VOLUME [ "/data" ]
diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile
index b7eefed05..80703f24d 100644
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -74,6 +74,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile
index ab7f922df..4e4dd1b9d 100644
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -70,6 +70,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile
index 9a94f92ca..11f3d992d 100644
--- a/fireflyiii_fints_importer/Dockerfile
+++ b/fireflyiii_fints_importer/Dockerfile
@@ -64,6 +64,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile
index b644f7be7..c240f726e 100644
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -64,6 +64,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index 2945e8c58..23d0a5726 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -80,6 +80,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/free_games_claimer/Dockerfile b/free_games_claimer/Dockerfile
index 6442142eb..8fb9199a6 100644
--- a/free_games_claimer/Dockerfile
+++ b/free_games_claimer/Dockerfile
@@ -63,6 +63,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 RUN \
diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile
index d9ea063e2..6d12ba75e 100644
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -65,6 +65,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/gitea/Dockerfile b/gitea/Dockerfile
index a844c2e9c..f6a8f72c8 100644
--- a/gitea/Dockerfile
+++ b/gitea/Dockerfile
@@ -67,6 +67,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/grav/Dockerfile b/grav/Dockerfile
index a01344f6d..c93b66405 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -71,6 +71,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile
index 166f7e24c..d9c7033f6 100644
--- a/guacamole/Dockerfile
+++ b/guacamole/Dockerfile
@@ -95,6 +95,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/immich/Dockerfile b/immich/Dockerfile
index 4db544aaf..9687f366e 100644
--- a/immich/Dockerfile
+++ b/immich/Dockerfile
@@ -86,6 +86,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile
index c376bb400..3e6877845 100644
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -88,6 +88,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 WORKDIR /
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index 9b3e76f40..686351f2d 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -70,6 +70,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index 87313a025..7019d821d 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -76,6 +76,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/jellyseerr/Dockerfile b/jellyseerr/Dockerfile
index 24c4d9c1e..3c783ce57 100644
--- a/jellyseerr/Dockerfile
+++ b/jellyseerr/Dockerfile
@@ -73,6 +73,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/joal/Dockerfile b/joal/Dockerfile
index 555cc844a..551d403d3 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -76,6 +76,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/joplin/Dockerfile b/joplin/Dockerfile
index 35246e97b..4b76a6710 100644
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -70,6 +70,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index 61567214a..2bcc0f449 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -70,6 +70,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/mealie/Dockerfile b/mealie/Dockerfile
index 635a07a0f..33bcb911b 100644
--- a/mealie/Dockerfile
+++ b/mealie/Dockerfile
@@ -71,6 +71,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 RUN \
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index 332138e61..35f741b56 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -67,6 +67,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 901fb3fc0..740c70272 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -93,6 +93,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 # Correct modifications
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index 5da293b74..b385e42e2 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -67,6 +67,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/omada/Dockerfile b/omada/Dockerfile
index 0d2ff93bf..d507f9ace 100644
--- a/omada/Dockerfile
+++ b/omada/Dockerfile
@@ -71,6 +71,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile
index 176865ca0..d39848bb8 100644
--- a/omada_v3/Dockerfile
+++ b/omada_v3/Dockerfile
@@ -72,6 +72,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 2605d01dc..f2e402f2f 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -67,6 +67,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 5141f1855..de8831219 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -67,6 +67,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile
index 69547ee58..e7092a461 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -68,6 +68,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile
index f941feb32..3861f0e9b 100644
--- a/paperless_ngx/Dockerfile
+++ b/paperless_ngx/Dockerfile
@@ -68,6 +68,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index 812a93c7e..1fce31e5a 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -78,6 +78,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile
index b28e4eea2..7ce308a8f 100644
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -75,6 +75,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index fb52931f5..bf5f5bb4d 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -69,6 +69,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 # hadolint ignore=SC2013
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 8691b3fa6..5c1ef173c 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -80,6 +80,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile
index 772743725..b392bcbd6 100644
--- a/plex_meta_manager/Dockerfile
+++ b/plex_meta_manager/Dockerfile
@@ -76,6 +76,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/portainer/Dockerfile b/portainer/Dockerfile
index 4784480c3..2aa9d5758 100644
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -86,6 +86,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 RUN chmod 777 /etc/services.d/*/*
diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile
index eef6aa8e1..1182bc396 100644
--- a/portainer_agent/Dockerfile
+++ b/portainer_agent/Dockerfile
@@ -72,6 +72,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 RUN chmod a+x /usr/sbin/healthcheck && \
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 3289d0b76..d7e43185b 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -68,6 +68,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 WORKDIR /data
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index 4e73f4c54..e765a95db 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -70,6 +70,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index ab1ec3c76..03020ecc3 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -106,6 +106,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index e634e034d..fff99fa48 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -71,6 +71,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index c3bba6e6c..cc8d5189e 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -68,6 +68,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index 5cdd1e5d1..6acbf0dc3 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -70,6 +70,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index f234c169c..0c7cc0f43 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -91,6 +91,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile
index 2b86d7b3c..4faf7f446 100644
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/Dockerfile
@@ -67,6 +67,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 3513d83d9..0452807c8 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -66,6 +66,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile
index 3513d83d9..0452807c8 100644
--- a/scrutiny_fa/Dockerfile
+++ b/scrutiny_fa/Dockerfile
@@ -66,6 +66,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/seafile/Dockerfile b/seafile/Dockerfile
index f26aa4da8..e83d70a39 100644
--- a/seafile/Dockerfile
+++ b/seafile/Dockerfile
@@ -68,6 +68,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index 772034c3a..f017ad44e 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -71,6 +71,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/sponsorblockcast/Dockerfile b/sponsorblockcast/Dockerfile
index 8e04a2fe8..79f8b5b60 100644
--- a/sponsorblockcast/Dockerfile
+++ b/sponsorblockcast/Dockerfile
@@ -65,6 +65,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 # Entrypoint logic
diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile
index ba344d73a..59c933009 100644
--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -121,6 +121,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile
index 26ebc7d4f..eb4569664 100644
--- a/tandoor_recipes/Dockerfile
+++ b/tandoor_recipes/Dockerfile
@@ -63,6 +63,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile
index 68d55953c..ac2aee61a 100644
--- a/tdarr/Dockerfile
+++ b/tdarr/Dockerfile
@@ -63,6 +63,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile
index 54ac4110e..acbdc8bfb 100644
--- a/teamspeak/Dockerfile
+++ b/teamspeak/Dockerfile
@@ -69,6 +69,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/test/Dockerfile b/test/Dockerfile
index eb92b49a4..fdcdc1eaa 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -64,8 +64,8 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
-    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh && \
-    echo "Shebang is $shebang"
+    mkdir -p /run/s6/container_environment && \
+    for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 # Entrypoint logic
 
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index 7861b39db..fe7505d61 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -78,6 +78,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile
index 5bd1ce488..c43768e4d 100644
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -73,6 +73,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 2a3c0350d..74bbdb1a3 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -81,6 +81,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile
index b5700a050..5cee38e6f 100644
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -66,6 +66,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 ############
diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile
index a5479bf57..3e84400c6 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -77,6 +77,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index 8e20e5e1c..1b81740cf 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -76,6 +76,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/wger/Dockerfile b/wger/Dockerfile
index 95d5456b4..8ad9a89bc 100644
--- a/wger/Dockerfile
+++ b/wger/Dockerfile
@@ -74,6 +74,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile
index da38d826f..78f18d256 100644
--- a/whoogle/Dockerfile
+++ b/whoogle/Dockerfile
@@ -68,6 +68,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 
diff --git a/xteve/Dockerfile b/xteve/Dockerfile
index d17ac9861..aecbeedb1 100644
--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -68,6 +68,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh
 
 #
diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile
index 515d0d996..3efde14df 100644
--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -73,6 +73,7 @@ RUN \
     if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \
     if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \
     #Correct shebang in entrypoint
+    mkdir -p /run/s6/container_environment && \
     for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done; sed -i "s|/command/with-contenv bashio|$shebang|g" /ha_entrypoint.sh