diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index b94e20ca8..5d73d24c0 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -21,19 +21,19 @@ FROM ${BUILD_FROM}
 ##################
 
 RUN \
-  ########################################
-  # Correct upstream image folders links #
-  ########################################
-  # Allow UID and GID setting
-  sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
-  && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
-  && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
-  \
-  # Allow custom config folder
-  && grep -rl '/config' /defaults/ | xargs sed -i 's|/config|/data/organizr|g' \
-  && grep -rl '/config' /etc/cont-init.d/ | xargs sed -i 's|/config|/data/organizr|g' \
-  && grep -rl '/config' /etc/logrotate.d/ | xargs sed -i 's|/config|/data/organizr|g' \
-  && grep -rl '/config' /etc/services.d/ | xargs sed -i 's|/config|/data/organizr|g'
+    ########################################
+    # Correct upstream image folders links #
+    ########################################
+    # Allow UID and GID setting
+    sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
+    && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
+    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
+    \
+    # Allow custom config folder
+    && grep -rl '/config' /defaults/ | xargs sed -i 's|/config|/data/organizr|g' \
+    && grep -rl '/config' /etc/cont-init.d/ | xargs sed -i 's|/config|/data/organizr|g' \
+    && grep -rl '/config' /etc/logrotate.d/ | xargs sed -i 's|/config|/data/organizr|g' \
+    && grep -rl '/config' /etc/services.d/ | xargs sed -i 's|/config|/data/organizr|g'
 
 ##################
 # 3 Install apps #
@@ -44,25 +44,25 @@ COPY rootfs/ /
 
 # Manual apps
 ENV PACKAGES="curl \
-  jq"
+    jq"
 
 # Automatic apps & bashio
 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi && \
-  if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi && \
-  curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \
-  chmod 777 /automatic_packages.sh && \
-  /automatic_packages.sh "${PACKAGES:-}" && \
-  rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
+    if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi && \
+    curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \
+    chmod 777 /automatic_packages.sh && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
+    rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
 # Modules
 ARG MODULES="00-banner.sh"
 
 # Automatic modules download
 RUN mkdir -p /tmpscripts /etc/cont-init.d && \
-  for scripts in $MODULES; do curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/$scripts" -o /tmpscripts/"$scripts"; done  && \
-  if [ -d /etc/cont-init.d ]; then /bin/cp -rf /tmpscripts/* /etc/cont-init.d/ && chmod -R 755 /etc/cont-init.d; fi && \
-  if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
-  rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
+    for scripts in $MODULES; do curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/$scripts" -o /tmpscripts/"$scripts"; done  && \
+    if [ -d /etc/cont-init.d ]; then /bin/cp -rf /tmpscripts/* /etc/cont-init.d/ && chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
+    rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
 ################
 # 4 Entrypoint #
@@ -80,20 +80,20 @@ ARG BUILD_REF
 ARG BUILD_REPOSITORY
 ARG BUILD_VERSION
 LABEL \
-  io.hass.name="${BUILD_NAME}" \
-  io.hass.description="${BUILD_DESCRIPTION}" \
-  io.hass.arch="${BUILD_ARCH}" \
-  io.hass.type="addon" \
-  io.hass.version=${BUILD_VERSION} \
-  maintainer="alexbelgium (https://github.com/alexbelgium)" \
-  org.opencontainers.image.title="${BUILD_NAME}" \
-  org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
-  org.opencontainers.image.vendor="Home Assistant Add-ons" \
-  org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
-  org.opencontainers.image.licenses="MIT" \
-  org.opencontainers.image.url="https://github.com/alexbelgium" \
-  org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
-  org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
-  org.opencontainers.image.created=${BUILD_DATE} \
-  org.opencontainers.image.revision=${BUILD_REF} \
-  org.opencontainers.image.version=${BUILD_VERSION}
+    io.hass.name="${BUILD_NAME}" \
+    io.hass.description="${BUILD_DESCRIPTION}" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.type="addon" \
+    io.hass.version=${BUILD_VERSION} \
+    maintainer="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.title="${BUILD_NAME}" \
+    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
+    org.opencontainers.image.vendor="Home Assistant Add-ons" \
+    org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.url="https://github.com/alexbelgium" \
+    org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
+    org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
+    org.opencontainers.image.created=${BUILD_DATE} \
+    org.opencontainers.image.revision=${BUILD_REF} \
+    org.opencontainers.image.version=${BUILD_VERSION}
diff --git a/webtop/Dockerfile b/webtop/Dockerfile
index 621acfcb8..984325175 100644
--- a/webtop/Dockerfile
+++ b/webtop/Dockerfile
@@ -23,13 +23,13 @@ FROM ${BUILD_FROM}ubuntu-mate
 
 # Allow UID and GID setting
 RUN sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
-  && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ 
-  && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
-  # Change home folder location
-  && sed -i 's|/config|/share/webtop|g' /defaults/* \
-  && sed -i 's|/config|/share/webtop|g' /etc/cont-init.d/* \
-  && sed -i 's|/config|/share/webtop|g' /etc/services.d/*/run \
-  && usermod --home /share/webtop abc
+    && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ 
+    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
+    # Change home folder location
+    && sed -i 's|/config|/share/webtop|g' /defaults/* \
+    && sed -i 's|/config|/share/webtop|g' /etc/cont-init.d/* \
+    && sed -i 's|/config|/share/webtop|g' /etc/services.d/*/run \
+    && usermod --home /share/webtop abc
 
 # Graphic drivers for rpi4
 RUN apt-get update && apt-get dist-upgrade && apt-get install -yqq libgles2-mesa libgles2-mesa-dev xorg-dev || true
@@ -46,21 +46,21 @@ ENV PACKAGES=""
 
 # Automatic apps & bashio
 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi && \
-  if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi && \
-  curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \
-  chmod 777 /automatic_packages.sh && \
-  /automatic_packages.sh "${PACKAGES:-}" && \
-  rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
+    if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi && \
+    curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \
+    chmod 777 /automatic_packages.sh && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
+    rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
 # Modules
 ARG MODULES="00-banner.sh"
 
 # Automatic modules download
 RUN mkdir -p /tmpscripts /etc/cont-init.d && \
-  for scripts in $MODULES; do curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/$scripts" -o /tmpscripts/"$scripts"; done  && \
-  if [ -d /etc/cont-init.d ]; then /bin/cp -rf /tmpscripts/* /etc/cont-init.d/ && chmod -R 755 /etc/cont-init.d; fi && \
-  if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
-  rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
+    for scripts in $MODULES; do curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/$scripts" -o /tmpscripts/"$scripts"; done  && \
+    if [ -d /etc/cont-init.d ]; then /bin/cp -rf /tmpscripts/* /etc/cont-init.d/ && chmod -R 755 /etc/cont-init.d; fi && \
+    if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
+    rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
 ################
 # 4 Entrypoint #
@@ -84,20 +84,20 @@ ARG BUILD_REF
 ARG BUILD_REPOSITORY
 ARG BUILD_VERSION
 LABEL \
-  io.hass.name="${BUILD_NAME}" \
-  io.hass.description="${BUILD_DESCRIPTION}" \
-  io.hass.arch="${BUILD_ARCH}" \
-  io.hass.type="addon" \
-  io.hass.version=${BUILD_VERSION} \
-  maintainer="alexbelgium (https://github.com/alexbelgium)" \
-  org.opencontainers.image.title="${BUILD_NAME}" \
-  org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
-  org.opencontainers.image.vendor="Home Assistant Add-ons" \
-  org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
-  org.opencontainers.image.licenses="MIT" \
-  org.opencontainers.image.url="https://github.com/alexbelgium" \
-  org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
-  org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
-  org.opencontainers.image.created=${BUILD_DATE} \
-  org.opencontainers.image.revision=${BUILD_REF} \
-  org.opencontainers.image.version=${BUILD_VERSION}
+    io.hass.name="${BUILD_NAME}" \
+    io.hass.description="${BUILD_DESCRIPTION}" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.type="addon" \
+    io.hass.version=${BUILD_VERSION} \
+    maintainer="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.title="${BUILD_NAME}" \
+    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
+    org.opencontainers.image.vendor="Home Assistant Add-ons" \
+    org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.url="https://github.com/alexbelgium" \
+    org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
+    org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
+    org.opencontainers.image.created=${BUILD_DATE} \
+    org.opencontainers.image.revision=${BUILD_REF} \
+    org.opencontainers.image.version=${BUILD_VERSION}