diff --git a/calibre/rootfs/etc/cont-init.d/00-data_location.sh b/calibre/rootfs/etc/cont-init.d/00-data_location.sh
index f2ca4bcfc..f6ab67e01 100755
--- a/calibre/rootfs/etc/cont-init.d/00-data_location.sh
+++ b/calibre/rootfs/etc/cont-init.d/00-data_location.sh
@@ -44,6 +44,11 @@ sed -i "s|/config/addons_config/calibre|$LOCATION|g" /defaults/* || true
 sed -i "s|/config/addons_config/calibre|$LOCATION|g" /etc/cont-init.d/* || true
 sed -i "s|/config/addons_config/calibre|$LOCATION|g" /etc/services.d/*/run || true
 
+if [ -d /var/run/s6/container_environment ]; then
+    printf "$LOCATION" > /var/run/s6/container_environment/HOME
+    printf "$LOCATION" > /var/run/s6/container_environment/FM_HOME
+fi
+
 usermod --home "$LOCATION" abc
 
 # Create folder
diff --git a/calibre/rootfs/etc/cont-init.d/80-configuration.sh b/calibre/rootfs/etc/cont-init.d/80-configuration.sh
index 3b3ef7ce3..af8e7b11e 100755
--- a/calibre/rootfs/etc/cont-init.d/80-configuration.sh
+++ b/calibre/rootfs/etc/cont-init.d/80-configuration.sh
@@ -14,6 +14,7 @@ if bashio::config.has_value 'KEYBOARD'; then
     KEYBOARD=$(bashio::config 'KEYBOARD')
     bashio::log.info "Setting keyboard to $KEYBOARD"
     sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run
+    if [ -d /var/run/s6/container_environment ]; then printf "$KEYBOARD" > /var/run/s6/container_environment/KEYBOARD; fi
 fi || true
 
 # Set cli args
@@ -22,6 +23,7 @@ if bashio::config.has_value 'CLI_ARGS'; then
     CLI_ARGS=$(bashio::config 'CLI_ARGS')
     bashio::log.info "Setting arguments to $CLI_ARGS"
     sed -i "1a export CLI_ARGS=$CLI_ARGS" /etc/s6-overlay/s6-rc.d/svc-web/run
+    if [ -d /var/run/s6/container_environment ]; then printf "$CLI_ARGS" > /var/run/s6/container_environment/CLI_ARGS; fi
 fi || true
 
 # Set password
@@ -30,4 +32,5 @@ if bashio::config.has_value 'PASSWORD'; then
     PASSWORD=$(bashio::config 'PASSWORD')
     bashio::log.info "Setting password to $PASSWORD"
     sed -i "1a export PASSWORD=$PASSWORD" /etc/s6-overlay/s6-rc.d/svc-web/run
+    if [ -d /var/run/s6/container_environment ]; then printf "$PASSWORD" > /var/run/s6/container_environment/PASSWORD; fi
 fi || true
diff --git a/calibre_web/rootfs/etc/cont-init.d/00-data_location.sh b/calibre_web/rootfs/etc/cont-init.d/00-data_location.sh
index 228258806..0df57cd09 100755
--- a/calibre_web/rootfs/etc/cont-init.d/00-data_location.sh
+++ b/calibre_web/rootfs/etc/cont-init.d/00-data_location.sh
@@ -36,6 +36,9 @@ sed -i "1a export FM_HOME=$LOCATION" /etc/services.d/*/run
 sed -i "s|/config/addons_config/calibre-web|$LOCATION|g" /defaults/*
 sed -i "s|/config/addons_config/calibre-web|$LOCATION|g" /etc/cont-init.d/*
 sed -i "s|/config/addons_config/calibre-web|$LOCATION|g" /etc/services.d/*/run
+if [ -d /var/run/s6/container_environment ]; then printf "$LOCATION" > /var/run/s6/container_environment/HOME; fi
+if [ -d /var/run/s6/container_environment ]; then printf "$LOCATION" > /var/run/s6/container_environment/FM_HOME; fi
+
 usermod --home "$LOCATION" abc
 
 # Create folder
diff --git a/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh b/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
index 466c784de..45403d64c 100755
--- a/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
+++ b/enedisgateway2mqtt/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
@@ -17,6 +17,7 @@ if bashio::config.true 'mqtt_autodiscover'; then
     export MQTT_SSL=$(bashio::services mqtt "ssl") || bashio::log.error "can't fetch bashio::services mqtt 'ssl'"
     export MQTT_USERNAME=$(bashio::services mqtt "username") || bashio::log.error "can't fetch bashio::services mqtt 'username'"
     export MQTT_PASSWORD=$(bashio::services mqtt "password") || bashio::log.error "can't fetch bashio::services mqtt 'password'"
+
     # Export variables
     for variables in "MQTT_HOST=$MQTT_HOST" "MQTT_PORT=$MQTT_PORT" "MQTT_SSL=$MQTT_SSL" "MQTT_USERNAME=$MQTT_USERNAME" "MQTT_PASSWORD=$MQTT_PASSWORD"; do
         sed -i "1a export $variables" /etc/cont-init.d/*/*run* 2>/dev/null || true
diff --git a/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh b/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
index 466c784de..45403d64c 100755
--- a/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
+++ b/enedisgateway2mqtt_dev/rootfs/etc/cont-init.d/91-mqtt_autodiscover.sh
@@ -17,6 +17,7 @@ if bashio::config.true 'mqtt_autodiscover'; then
     export MQTT_SSL=$(bashio::services mqtt "ssl") || bashio::log.error "can't fetch bashio::services mqtt 'ssl'"
     export MQTT_USERNAME=$(bashio::services mqtt "username") || bashio::log.error "can't fetch bashio::services mqtt 'username'"
     export MQTT_PASSWORD=$(bashio::services mqtt "password") || bashio::log.error "can't fetch bashio::services mqtt 'password'"
+
     # Export variables
     for variables in "MQTT_HOST=$MQTT_HOST" "MQTT_PORT=$MQTT_PORT" "MQTT_SSL=$MQTT_SSL" "MQTT_USERNAME=$MQTT_USERNAME" "MQTT_PASSWORD=$MQTT_PASSWORD"; do
         sed -i "1a export $variables" /etc/cont-init.d/*/*run* 2>/dev/null || true
diff --git a/gazpar2mqtt/rootfs/etc/cont-init.d/89-mqtt_autodiscover.sh b/gazpar2mqtt/rootfs/etc/cont-init.d/89-mqtt_autodiscover.sh
index c2c6ddc5c..bdc1df720 100755
--- a/gazpar2mqtt/rootfs/etc/cont-init.d/89-mqtt_autodiscover.sh
+++ b/gazpar2mqtt/rootfs/etc/cont-init.d/89-mqtt_autodiscover.sh
@@ -21,6 +21,7 @@ if bashio::config.true 'mqtt_autodiscover'; then
     export MQTT_USERNAME
     MQTT_PASSWORD=$(bashio::services mqtt "password")
     export MQTT_PASSWORD
+
     # Export variables
     for variables in "MQTT_HOST=$MQTT_HOST" "MQTT_PORT=$MQTT_PORT" "MQTT_SSL=$MQTT_SSL" "MQTT_USERNAME=$MQTT_USERNAME" "MQTT_PASSWORD=$MQTT_PASSWORD"; do
         sed -i "1a export $variables" /etc/services.d/*/*run* 2>/dev/null || true
diff --git a/qbittorrent/rootfs/etc/openvpn/down.sh b/qbittorrent/rootfs/etc/openvpn/down.sh
index a83f98272..8ebaf7218 100755
--- a/qbittorrent/rootfs/etc/openvpn/down.sh
+++ b/qbittorrent/rootfs/etc/openvpn/down.sh
@@ -25,6 +25,7 @@ if [ -n "${RC_SVCNAME}" ]; then
     # Re-enter the init script to start any dependant services
     if /etc/init.d/"${RC_SVCNAME}" --quiet status ; then
         export IN_BACKGROUND=true
+        if [ -d /var/run/s6/container_environment ]; then printf "true" > /var/run/s6/container_environment/IN_BACKGROUND; fi
         /etc/init.d/"${RC_SVCNAME}" --quiet stop
     fi
 fi
diff --git a/qbittorrent/rootfs/etc/openvpn/up.sh b/qbittorrent/rootfs/etc/openvpn/up.sh
index c5486d267..2f69a5490 100755
--- a/qbittorrent/rootfs/etc/openvpn/up.sh
+++ b/qbittorrent/rootfs/etc/openvpn/up.sh
@@ -78,6 +78,7 @@ if [ -n "${RC_SVCNAME}" ]; then
     # Re-enter the init script to start any dependant services
     if ! /etc/init.d/"${RC_SVCNAME}" --quiet status ; then
         export IN_BACKGROUND=true
+        if [ -d /var/run/s6/container_environment ]; then printf "true" > /var/run/s6/container_environment/IN_BACKGROUND; fi
         /etc/init.d/${RC_SVCNAME} --quiet start
     fi
 fi
diff --git a/scrutiny/rootfs/etc/cont-init.d/90-run.sh b/scrutiny/rootfs/etc/cont-init.d/90-run.sh
index 9ca78e808..37c3e2c26 100755
--- a/scrutiny/rootfs/etc/cont-init.d/90-run.sh
+++ b/scrutiny/rootfs/etc/cont-init.d/90-run.sh
@@ -40,6 +40,7 @@ if [[ "$(bashio::config "Mode")" == Collector ]]; then
     if bashio::config.has_value "COLLECTOR_API_ENDPOINT"; then
         echo "export COLLECTOR_API_ENDPOINT=$(bashio::config "COLLECTOR_API_ENDPOINT")" >> /env.sh
         sed -i "1a export COLLECTOR_API_ENDPOINT=$(bashio::config "COLLECTOR_API_ENDPOINT")" /etc/services.d/collector-once/run
+        if [ -d /var/run/s6/container_environment ]; then printf "$COLLECTOR_API_ENDPOINT" > /var/run/s6/container_environment/COLLECTOR_API_ENDPOINT; fi
         bashio::log.info "Using 'COLLECTOR_API_ENDPOINT' $(bashio::config "COLLECTOR_API_ENDPOINT")"
     else
         bashio::exit.nok "Mode is set to 'Collector', but 'COLLECTOR_API_ENDPOINT' is not defined"
diff --git a/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh b/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh
index 2a9f7123d..21449bde4 100755
--- a/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh
+++ b/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh
@@ -62,6 +62,7 @@ case "$FREQUENCY" in
         sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * 0\"" /etc/cont-init.d/50-cron-config
         ;;
 esac
+
 ############################
 # SMARTCTL COMMAND OPTIONS #
 ############################
diff --git a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh
index d099512c8..5c238bc3d 100755
--- a/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/00-data_location.sh
@@ -39,6 +39,8 @@ sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /defaults -type f) || true
 sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/cont-init.d -type f) || true
 sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/services.d -type f) || true
 sed -i "s|/share/webtop_kde|$LOCATION|g" $(find /etc/s6-overlay/s6-rc.d -type f) || true
+if [ -d /var/run/s6/container_environment ]; then printf "$LOCATION" > /var/run/s6/container_environment/HOME; fi
+if [ -d /var/run/s6/container_environment ]; then printf "$LOCATION" > /var/run/s6/container_environment/FM_HOME; fi
 
 usermod --home "$LOCATION" abc
 
diff --git a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh
index 2ad700137..f6dd0d5d2 100755
--- a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh
@@ -48,6 +48,7 @@ if bashio::config.has_value 'KEYBOARD'; then
     KEYBOARD=$(bashio::config 'KEYBOARD')
     bashio::log.info "Setting keyboard to $KEYBOARD"
     sed -i "1a export KEYBOARD=$KEYBOARD" /etc/s6-overlay/s6-rc.d/svc-web/run
+    if [ -d /var/run/s6/container_environment ]; then printf "$KEYBOARD" > /var/run/s6/container_environment/KEYBOARD; fi
 fi
 
 # Set password