diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile
index 652db1e3a..dffd359e1 100644
--- a/spotweb/Dockerfile
+++ b/spotweb/Dockerfile
@@ -82,36 +82,27 @@ RUN apk -U update && \
 # Copy rootfs
 COPY rootfs /
 
-##############################
-# Automatic modules download #
-##############################
-if [ -e "/MODULESFILE" ]; then
-    echo "Executing modules script"
-    MODULES=$(</MODULESFILE)
-    MODULES="${MODULES:-00-banner.sh}"
+# Modules
+ARG MODULES="00-banner.sh"
 
-    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) >/dev/null; fi \
+# 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) >/dev/null; 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) >/dev/null; fi \
     && mkdir -p /etc/cont-init.d \
     && for scripts in $MODULES; do curl -L -f -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" || (echo "script failed to install $scripts" && exit 1); done \
-    && chmod -R 755 /etc/cont-init.d
-fi
+    && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE
 
-#######################
-# Automatic installer #
-#######################
-if [ -e "/ENVFILE" ]; then
-    echo "Executing script"
-    PACKAGES=$(</ENVFILE)
+# Manual apps
+ENV PACKAGES=""
 
-    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) >/dev/null; fi \
+# 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) >/dev/null; 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) >/dev/null; fi \
     && curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \
     && chmod 777 /automatic_packages.sh \
     && eval /./automatic_packages.sh "${PACKAGES:-}" \
-    && rm /automatic_packages.sh
-fi
-
+    && rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
+    
 ################
 # 4 Entrypoint #
 ################