diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile
index fd7f6096f..47f2241a5 100644
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/autobrr"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/battybirdnet-pi/Dockerfile b/battybirdnet-pi/Dockerfile
index 796343f2e..b8bdecae2 100644
--- a/battybirdnet-pi/Dockerfile
+++ b/battybirdnet-pi/Dockerfile
@@ -32,7 +32,6 @@ ENV DEBIAN_FRONTEND="noninteractive" \
     LANGUAGE=en_US:en
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index 2790a9ee9..6819ac7aa 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/birdnet-pi/Dockerfile b/birdnet-pi/Dockerfile
index 18c34e61b..3199b54e5 100644
--- a/birdnet-pi/Dockerfile
+++ b/birdnet-pi/Dockerfile
@@ -32,7 +32,6 @@ ENV DEBIAN_FRONTEND="noninteractive" \
     LANGUAGE=en_US:en
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/birdnet-pipy/Dockerfile b/birdnet-pipy/Dockerfile
index 7633a80a0..ec321925b 100644
--- a/birdnet-pipy/Dockerfile
+++ b/birdnet-pipy/Dockerfile
@@ -45,7 +45,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index eba21fc49..2046feb9e 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -32,7 +32,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 ENV BOOKSONIC_AIR_SETTINGS="/data"
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/data"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/browser_brave/Dockerfile b/browser_brave/Dockerfile
index 468c7043b..442803a2b 100644
--- a/browser_brave/Dockerfile
+++ b/browser_brave/Dockerfile
@@ -48,7 +48,6 @@ RUN \
 RUN sed -i '/no-first-run/a\  --remote-debugging-address=0.0.0.0 --remote-debugging-port=9221 \\' /usr/bin/wrapped-*
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/browser_chromium/Dockerfile b/browser_chromium/Dockerfile
index 468c7043b..442803a2b 100644
--- a/browser_chromium/Dockerfile
+++ b/browser_chromium/Dockerfile
@@ -48,7 +48,6 @@ RUN \
 RUN sed -i '/no-first-run/a\  --remote-debugging-address=0.0.0.0 --remote-debugging-port=9221 \\' /usr/bin/wrapped-*
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/calibre/Dockerfile b/calibre/Dockerfile
index cf4c68d90..1b953d5d7 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -38,7 +38,6 @@ RUN \
     && mkdir -p /opt/calibre
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile
index f964db404..2b5e586b3 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -36,7 +36,6 @@ RUN \
     && echo '#!/bin/sh' > /usr/bin/xdg-mime && chmod +x /usr/bin/xdg-mime
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/changedetection.io/Dockerfile b/changedetection.io/Dockerfile
index 828a4cf3d..3b8efb204 100644
--- a/changedetection.io/Dockerfile
+++ b/changedetection.io/Dockerfile
@@ -30,7 +30,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 # Image specific modifications
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/changedetection.io"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/collabora/Dockerfile b/collabora/Dockerfile
index b94306ca0..f4b4664c4 100644
--- a/collabora/Dockerfile
+++ b/collabora/Dockerfile
@@ -30,7 +30,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/data"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/emby/Dockerfile b/emby/Dockerfile
index 6b22ae3b1..18ad61357 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/emby"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/emby_beta/Dockerfile b/emby_beta/Dockerfile
index 4ca2189d1..a9cb57841 100644
--- a/emby_beta/Dockerfile
+++ b/emby_beta/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/emby"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index e96896f95..12cf94af5 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -39,7 +39,6 @@ RUN \
     && sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); else FG_PLUGINS=""; fi/g' $file
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/flexget"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/grav/Dockerfile b/grav/Dockerfile
index 8bfd9c048..86db91e4b 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/share/grav"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/immich/Dockerfile b/immich/Dockerfile
index 4244eff3c..8b3bdf01b 100644
--- a/immich/Dockerfile
+++ b/immich/Dockerfile
@@ -30,7 +30,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/immich_cuda/Dockerfile b/immich_cuda/Dockerfile
index 69c0c3409..5f8760805 100644
--- a/immich_cuda/Dockerfile
+++ b/immich_cuda/Dockerfile
@@ -30,7 +30,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/immich_noml/Dockerfile b/immich_noml/Dockerfile
index 69c0c3409..5f8760805 100644
--- a/immich_noml/Dockerfile
+++ b/immich_noml/Dockerfile
@@ -30,7 +30,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index f0e4ab222..1f875943b 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/Jackett"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index 4ef611e0c..45767e5a0 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -30,7 +30,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=0 \
 ENV S6_READ_ONLY_ROOT=1
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/jellyseerr/Dockerfile b/jellyseerr/Dockerfile
index 1afaa3d85..124506a5d 100644
--- a/jellyseerr/Dockerfile
+++ b/jellyseerr/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/jellyseerr"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/kometa/Dockerfile b/kometa/Dockerfile
index 8a283152a..78e4192f5 100644
--- a/kometa/Dockerfile
+++ b/kometa/Dockerfile
@@ -37,7 +37,6 @@ RUN \
     && curl -f -L -s -S "https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager/master/config/config.yml.template" -o /templates/config.yml
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/kometa"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/librespeed/Dockerfile b/librespeed/Dockerfile
index b3ceac3a9..95e9ba4b6 100644
--- a/librespeed/Dockerfile
+++ b/librespeed/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/data"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index aaeaf5a42..ced7fa2e8 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index 21a1551ad..3e18d2d4c 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/data"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 18b8e9798..84a31f43b 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -65,7 +65,6 @@ RUN \
     echo "sed -i \"/datadirectory/a\ \ 'check_data_directory_permissions' => false,\" /config/www/nextcloud/config/config.php || true" >> /etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/data/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index ff5210f9c..136476683 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index c38873680..3b18a238a 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -29,7 +29,6 @@ ENV DOTNET_USE_POLLING_FILE_WATCHER=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/ombi"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/omni-tools/Dockerfile b/omni-tools/Dockerfile
index eef24ab45..f0172a9b5 100644
--- a/omni-tools/Dockerfile
+++ b/omni-tools/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/emby"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 80bef007e..29e2b9da6 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/data/organizr"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile
index 355ef8fc6..4a9f86ba6 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/overseerr"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 5ac033132..a8467932d 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/piwigo"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/plex/Dockerfile b/plex/Dockerfile
index e11714aee..d1a8fb9a1 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -39,7 +39,6 @@ RUN \
 #ENV PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/share/plex/Library/Application Support"
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index 0608d8a9a..c5b64ad1a 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 0e008e406..a1d2db7de 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -57,7 +57,6 @@ RUN \
     && rm vuetorrent.zip >/dev/null
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index 793967767..dd985971a 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 2941e0960..4c030270f 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index 43d54b993..18c01e034 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/data"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index a5f526e85..d2bb6e100 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -46,7 +46,6 @@ RUN \
     && sed -i 's|"/sync",|"/", "/sync",|g' /defaults/sync.conf
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile
index ff5210f9c..136476683 100644
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index 9ebad920e..cb7870531 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index ed6c3d668..d5c8407ac 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -39,7 +39,6 @@ RUN \
     && ln -s /usr/share/transmission/web /standard
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/transmission"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile
index 2ef60df12..367ef632a 100644
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/transmission_openvpn"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index e6d4a4091..66f3c72a5 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -39,7 +39,6 @@ RUN \
     && sed -i 's|{MAXMEM:-512}|(bashio::config "maxmem")|g' /etc/s6-overlay/s6-rc.d/svc-ubooquity/run
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/ubooquity"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile
index 342032016..7b9e43e9e 100644
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -28,7 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-#ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 #ARG CONFIGLOCATION="/config"
 #RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile
index 006753246..b15117b12 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -45,7 +45,6 @@ RUN \
     if [[ -d /etc/services.d ]] && ls /etc/services.d/*/run 1> /dev/null 2>&1; then sed -i "1a set +e" /etc/services.d/*/run; fi
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/data_kde"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/zzz_archived_code-server/Dockerfile b/zzz_archived_code-server/Dockerfile
index 56c7706d6..0f53c3a24 100644
--- a/zzz_archived_code-server/Dockerfile
+++ b/zzz_archived_code-server/Dockerfile
@@ -29,7 +29,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/data"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/zzz_archived_papermerge/Dockerfile b/zzz_archived_papermerge/Dockerfile
index cb32e33f8..840561941 100644
--- a/zzz_archived_papermerge/Dockerfile
+++ b/zzz_archived_papermerge/Dockerfile
@@ -36,7 +36,6 @@ RUN \
     && sed -i 's|papermerge/confi|papermerge/config|g' /etc/cont-init.d/*
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
diff --git a/zzz_archived_plex_meta_manager/Dockerfile b/zzz_archived_plex_meta_manager/Dockerfile
index 575a5a886..bd13e9ac6 100644
--- a/zzz_archived_plex_meta_manager/Dockerfile
+++ b/zzz_archived_plex_meta_manager/Dockerfile
@@ -37,7 +37,6 @@ RUN \
     && curl -f -L -s -S "https://raw.githubusercontent.com/meisnate12/Plex-Meta-Manager/master/config/config.yml.template" -o /templates/config.yml
 
 # Global LSIO modifications
-ENV LSIO_NON_ROOT_USER=0
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/plex-meta-manager"
 RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh