diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile
index 57d3dd7a6..9a2211447 100644
--- a/fireflyiii/Dockerfile
+++ b/fireflyiii/Dockerfile
@@ -34,17 +34,6 @@ FROM ${BUILD_FROM}
 # Copy local files
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -57,6 +46,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile
index 6a1c3ee3b..980839e27 100644
--- a/fireflyiii_data_importer/Dockerfile
+++ b/fireflyiii_data_importer/Dockerfile
@@ -35,17 +35,6 @@ FROM ${BUILD_FROM}${BUILD_UPSTREAM}
 # Copy local files
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -58,6 +47,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile
index f9b9603b9..f2e89e4e1 100644
--- a/flaresolverr/Dockerfile
+++ b/flaresolverr/Dockerfile
@@ -29,17 +29,6 @@ USER root
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -52,6 +41,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile
index 10911f635..7e92eadc4 100644
--- a/gazpar2mqtt/Dockerfile
+++ b/gazpar2mqtt/Dockerfile
@@ -28,6 +28,18 @@ ENV TZ=Europe/Paris
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -41,18 +53,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/grav/Dockerfile b/grav/Dockerfile
index 648f39330..6df90bd76 100644
--- a/grav/Dockerfile
+++ b/grav/Dockerfile
@@ -38,6 +38,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -52,18 +64,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile
index c7e96481b..f2ad1d113 100644
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -31,6 +31,18 @@ ENV LANG='C.UTF-8'\
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="curl \
     jq \
@@ -61,18 +73,6 @@ RUN apk add --no-cache \
     rm -rf $GOPATH /var/cache/apk/* /tmp/src &&\
     apk del .build-deps xz build-base || true
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index 113535fa4..bb3866067 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -39,17 +39,6 @@ ENV XDG_CONFIG_HOME="/config/addons_config"
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-ENV PACKAGES="curl"
-
-# 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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -62,6 +51,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+ENV PACKAGES="curl"
+
+# 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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index 6f007adc4..8fbd5bfb0 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -37,17 +37,6 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -60,6 +49,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/joal/Dockerfile b/joal/Dockerfile
index 7c188a3b9..18e185d3f 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -13,6 +13,7 @@
 # 1 Build Image #
 #################
 
+ARG BUILD_VERSION
 ARG BUILD_FROM
 ARG BUILD_UPSTREAM="2.1.29"
 FROM anthonyraymond/joal:$BUILD_UPSTREAM
@@ -30,6 +31,8 @@ RUN \
     chown -R $(id -u):$(id -g) /data/joal &&\
     rm /data/joal/jack-of* || true
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 ##################
 # 3 Install apps #
 ##################
@@ -49,11 +52,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="2.1.29"
-
 # Modules
 ARG MODULES="00-banner.sh"
 
diff --git a/joplin/Dockerfile b/joplin/Dockerfile
index fe108c65f..048d670a5 100644
--- a/joplin/Dockerfile
+++ b/joplin/Dockerfile
@@ -29,19 +29,6 @@ USER root
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-ENV PACKAGES="jq \
-    curl"
-
-# 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
-
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -54,6 +41,18 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+ENV PACKAGES="jq \
+    curl"
+
+# 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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index a054bb756..1c2a8fc7b 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -38,6 +38,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -52,18 +64,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/mealie/Dockerfile b/mealie/Dockerfile
index f7c4cb815..aec47539d 100644
--- a/mealie/Dockerfile
+++ b/mealie/Dockerfile
@@ -32,17 +32,6 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-ENV PACKAGES="jq curl bash"
-
-# 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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -55,6 +44,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+ENV PACKAGES="jq curl bash"
+
+# 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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index 7974cc5f9..211026201 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -36,17 +36,6 @@ RUN sed -i "s|/config|/data|g" /etc/services.d/*/run \
 # Copy local files
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -59,6 +48,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 42c70d2fa..8411705d0 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -50,6 +50,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="curl jq wget"
 
@@ -63,18 +75,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
 
 VOLUME ["/share", "/ssl", "/data", "/media"]
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile
index 911e97111..3e7eeda30 100644
--- a/nzbget/Dockerfile
+++ b/nzbget/Dockerfile
@@ -38,17 +38,6 @@ RUN sed -i "s|/config|/config/addons_config/nzbget|g" /etc/services.d/nzbget/run
 # Copy local files
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -61,6 +50,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 9bbb2fa00..6dcc73f64 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -39,17 +39,6 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-ENV PACKAGES="jq curl"
-
-# 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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -62,6 +51,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+ENV PACKAGES="jq curl"
+
+# 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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index 8caa5c091..133abe54a 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -42,18 +42,6 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-ENV PACKAGES="curl \
-    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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -66,6 +54,18 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+ENV PACKAGES="curl \
+    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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/paperless_ng/Dockerfile b/paperless_ng/Dockerfile
index 5bc20bde7..849a5886e 100644
--- a/paperless_ng/Dockerfile
+++ b/paperless_ng/Dockerfile
@@ -41,6 +41,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="yamllint \
     pip \
@@ -54,18 +66,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index dce4b6934..2c92f871b 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -37,6 +37,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -51,18 +63,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile
index 427145582..b9b1bbeaf 100644
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -43,6 +43,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -58,18 +70,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index 0be32ae4c..28a789647 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -35,6 +35,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -48,18 +60,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/plex/Dockerfile b/plex/Dockerfile
index fb38179b3..261bb0517 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -50,6 +50,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     cifs-utils \
@@ -63,18 +75,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/portainer/Dockerfile b/portainer/Dockerfile
index a36830cb5..45085a06c 100644
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -50,17 +50,6 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-ENV PACKAGES="nginx"
-
-# 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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -73,6 +62,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+ENV PACKAGES="nginx"
+
+# 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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index cd69c030c..f8e25ca99 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -39,6 +39,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -53,18 +65,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 5b1c7a57f..f72bfbcd1 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -55,17 +55,6 @@ RUN \
 # Copy local files
 COPY rootfs/ /
 
-# Manual apps
-ARG 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
-
 # Modules
 ARG MODULES="00-banner.sh 92-local_mounts.sh 92-smb_mounts.sh 90-dns_set.sh"
 
@@ -78,6 +67,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+ARG 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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index 44e00aabb..b3125c9f8 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -39,6 +39,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV BASHIO_VERSION=0.14.3
 ENV PACKAGES="jq \
@@ -54,18 +66,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 7f98a16d7..2a940d2f6 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -37,17 +37,6 @@ RUN sed -i "s|/config|/config/addons_config/radarr/readarr|g" /etc/services.d/re
 # Copy local files
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -60,6 +49,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index 1ca11afd4..6cd165759 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -38,6 +38,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -52,18 +64,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index ec00ef63e..f36218c8f 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -48,6 +48,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -62,18 +74,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 8037e1980..fc0eff094 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -41,6 +41,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -55,18 +67,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index 0adce264f..d1056e13b 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -39,6 +39,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -53,18 +65,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile
index 2850ec97b..d89071a64 100644
--- a/teamspeak/Dockerfile
+++ b/teamspeak/Dockerfile
@@ -34,17 +34,6 @@ VOLUME [ "/data:/var/ts3server/" ]
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -57,6 +46,16 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
 
 ################
 # 4 Entrypoint #
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index 187cd7f87..fe389e500 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -41,17 +41,6 @@ RUN sed -i "s|config|config/transmission|g" /etc/services.d/transmission/run \
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -64,6 +53,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 2a20b2a70..f14fd4a31 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -46,6 +46,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="curl \
     jq \
@@ -60,18 +72,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/webtop/Dockerfile b/webtop/Dockerfile
index 232884bb8..d26cdc992 100644
--- a/webtop/Dockerfile
+++ b/webtop/Dockerfile
@@ -41,17 +41,6 @@ RUN apt-get update && apt-get dist-upgrade && apt-get install -yqq libgles2-mesa
 # Add rootfs
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh 92-local_mounts.sh 92-smb_mounts.sh 90-dns_set.sh"
 
@@ -64,6 +53,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index a0a1061c7..e5b18ad7c 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -37,6 +37,18 @@ RUN \
 # Add rootfs
 COPY rootfs/ /
 
+# Modules
+ARG MODULES="00-banner.sh"
+
+# Automatic modules download
+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 && \
+    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
+
 # Manual apps
 ENV PACKAGES="jq \
     curl \
@@ -50,18 +62,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
-# Modules
-ARG MODULES="00-banner.sh"
-
-# Automatic modules download
-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 && \
-    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
-
 ################
 # 4 Entrypoint #
 ################
diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile
index 2a7d1c10b..92404efa8 100644
--- a/whoogle/Dockerfile
+++ b/whoogle/Dockerfile
@@ -30,17 +30,6 @@ FROM ${BUILD_FROM}
 # Copy local files
 COPY rootfs/ /
 
-# Manual apps
-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
-
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -53,6 +42,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################
diff --git a/xteve/Dockerfile b/xteve/Dockerfile
index e83a4be9d..74bd41ef3 100644
--- a/xteve/Dockerfile
+++ b/xteve/Dockerfile
@@ -26,6 +26,13 @@ RUN cp -vnpr /etc/opt/xteve* /data || true
 
 CMD ["-config", "/data", "-port", "34400"]
 
+##################
+# 3 Install apps #
+##################
+
+# Copy local files
+COPY rootfs/ /
+
 # Modules
 ARG MODULES="00-banner.sh"
 
@@ -38,6 +45,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
 
+# Manual apps
+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
+
 ################
 # 4 Entrypoint #
 ################