diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile
index ea3060246a..da3a237889 100644
--- a/autobrr/Dockerfile
+++ b/autobrr/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 964f9aba06..c5cfbafac0 100644
--- a/battybirdnet-pi/Dockerfile
+++ b/battybirdnet-pi/Dockerfile
@@ -32,6 +32,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \
     LANGUAGE=en_US:en
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 966e97548f..a1d9ff5620 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 217db9969b..7ef4294800 100644
--- a/birdnet-pi/Dockerfile
+++ b/birdnet-pi/Dockerfile
@@ -32,6 +32,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \
     LANGUAGE=en_US:en
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 cedb1628a3..3f15db650b 100644
--- a/birdnet-pipy/Dockerfile
+++ b/birdnet-pipy/Dockerfile
@@ -44,6 +44,12 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 
 USER root
 
+# Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
+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
+
 ##################
 # 3 Install apps #
 ##################
diff --git a/birdnet-pipy/config.yaml b/birdnet-pipy/config.yaml
index 1f479609f7..7d79ff1d06 100644
--- a/birdnet-pipy/config.yaml
+++ b/birdnet-pipy/config.yaml
@@ -98,4 +98,4 @@ schema:
   ssl: bool?
 slug: birdnet-pipy
 url: https://github.com/alexbelgium/hassio-addons/tree/master/birdnet-pipy
-version: '0.2'
+version: '0.3'
diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile
index 99f3a41021..a409e9fdaa 100644
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -32,6 +32,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 ENV BOOKSONIC_AIR_SETTINGS="/data"
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 5cc5224919..b88605bb21 100644
--- a/browser_brave/Dockerfile
+++ b/browser_brave/Dockerfile
@@ -48,6 +48,7 @@ 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=1
 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 5cc5224919..b88605bb21 100644
--- a/browser_chromium/Dockerfile
+++ b/browser_chromium/Dockerfile
@@ -48,6 +48,7 @@ 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=1
 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 956bd0d46d..d231818c43 100644
--- a/calibre/Dockerfile
+++ b/calibre/Dockerfile
@@ -38,6 +38,7 @@ RUN \
     && mkdir -p /opt/calibre
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 e897297521..f1a0271f0a 100644
--- a/calibre_web/Dockerfile
+++ b/calibre_web/Dockerfile
@@ -36,6 +36,7 @@ RUN \
     && echo '#!/bin/sh' > /usr/bin/xdg-mime && chmod +x /usr/bin/xdg-mime
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 5d6eaec12b..82b27937e0 100644
--- a/changedetection.io/Dockerfile
+++ b/changedetection.io/Dockerfile
@@ -30,6 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 # Image specific modifications
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 338ac39c86..e311d2dfd8 100644
--- a/collabora/Dockerfile
+++ b/collabora/Dockerfile
@@ -30,6 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 d23ae183ec..8977ea5e4b 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 ce203bcb96..8032aa4933 100644
--- a/emby_beta/Dockerfile
+++ b/emby_beta/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 d7d54d797d..911dbe9417 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -39,6 +39,7 @@ 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=1
 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 9a9b773821..8b113ff87a 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 d437492786..05c209cfef 100644
--- a/immich/Dockerfile
+++ b/immich/Dockerfile
@@ -30,6 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 d437492786..05c209cfef 100644
--- a/immich_cuda/Dockerfile
+++ b/immich_cuda/Dockerfile
@@ -30,6 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 d437492786..05c209cfef 100644
--- a/immich_noml/Dockerfile
+++ b/immich_noml/Dockerfile
@@ -30,6 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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_openvino/Dockerfile b/immich_openvino/Dockerfile
index d437492786..05c209cfef 100644
--- a/immich_openvino/Dockerfile
+++ b/immich_openvino/Dockerfile
@@ -30,6 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
 USER root
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 6fabde75c3..921ddcf084 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 4d2121e9e3..4ed9435bc3 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -30,6 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=0 \
 ENV S6_READ_ONLY_ROOT=1
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 8f531c678c..b44f1a6614 100644
--- a/jellyseerr/Dockerfile
+++ b/jellyseerr/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 4904d26fb1..28f12c1b0b 100644
--- a/kometa/Dockerfile
+++ b/kometa/Dockerfile
@@ -37,6 +37,7 @@ 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=1
 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 fb220cf34d..96f110fc30 100644
--- a/librespeed/Dockerfile
+++ b/librespeed/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 c8ef58def5..7e05cd7015 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 b037516484..a4ed7ad205 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 49fb37cd8d..be3ab86efc 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -65,6 +65,7 @@ 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=1
 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 043009501e..2769fd9ab6 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 fec9c599d5..a50ecfbddb 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -29,6 +29,7 @@ ENV DOTNET_USE_POLLING_FILE_WATCHER=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 279439fe9d..6930dd0e0d 100644
--- a/omni-tools/Dockerfile
+++ b/omni-tools/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 c1b0c70fa2..75aac06c30 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -27,6 +27,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 5d7a932f65..8d4908ee18 100644
--- a/overseerr/Dockerfile
+++ b/overseerr/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 7f23ea8e19..19511cea43 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 ed0b9ad632..e57c637972 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -39,6 +39,7 @@ RUN \
 #ENV PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/share/plex/Library/Application Support"
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 bec6391c9d..513dd80783 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 844af16632..dc83cae612 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -57,6 +57,7 @@ RUN \
     && rm vuetorrent.zip >/dev/null
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 b9b0b88dde..0839d2e2fa 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 2abf523572..d350f50aa1 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 3ac0e606a7..81dd66ec96 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 74209eb0ad..25f0a7841f 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -46,6 +46,7 @@ RUN \
     && sed -i 's|"/sync",|"/", "/sync",|g' /defaults/sync.conf
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 043009501e..2769fd9ab6 100644
--- a/sabnzbd/Dockerfile
+++ b/sabnzbd/Dockerfile
@@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 6d9b3015ac..bc1f550c59 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 8218457e57..6933b757f7 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -39,6 +39,7 @@ RUN \
     && ln -s /usr/share/transmission/web /standard
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 e7f60761e8..acc6d113f7 100644
--- a/transmission_openvpn/Dockerfile
+++ b/transmission_openvpn/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 3290af232b..ab119ec778 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -39,6 +39,7 @@ 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=1
 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 9441f61812..4e5579f5d0 100644
--- a/unpackerr/Dockerfile
+++ b/unpackerr/Dockerfile
@@ -28,7 +28,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
-#ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
+#ENV LSIO_NON_ROOT_USER=1
+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 6f05c83118..3b969c72a5 100644
--- a/webtop_kde/Dockerfile
+++ b/webtop_kde/Dockerfile
@@ -45,6 +45,7 @@ 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=1
 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 b47b3ef927..df9d9a5032 100644
--- a/zzz_archived_code-server/Dockerfile
+++ b/zzz_archived_code-server/Dockerfile
@@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_SERVICES_GRACETIME=0
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 5ea3943864..c4d498fd3a 100644
--- a/zzz_archived_papermerge/Dockerfile
+++ b/zzz_archived_papermerge/Dockerfile
@@ -36,6 +36,7 @@ RUN \
     && sed -i 's|papermerge/confi|papermerge/config|g' /etc/cont-init.d/*
 
 # Global LSIO modifications
+ENV LSIO_NON_ROOT_USER=1
 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 c7476839e8..3f8757cefe 100644
--- a/zzz_archived_plex_meta_manager/Dockerfile
+++ b/zzz_archived_plex_meta_manager/Dockerfile
@@ -37,6 +37,7 @@ 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=1
 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