diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile
index adcfca914..356295086 100644
--- a/addons_updater/Dockerfile
+++ b/addons_updater/Dockerfile
@@ -25,7 +25,7 @@ RUN $(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends b
     $(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl || apk add --no-cache curl) && \
     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" && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
 ##############
diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile
index 7b62062b6..72c4fd184 100644
--- a/arpspoof/Dockerfile
+++ b/arpspoof/Dockerfile
@@ -25,7 +25,7 @@ RUN $(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends b
     $(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl || apk add --no-cache curl) && \
     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" && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
 ##############
diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index ff8be2944..ac9b4bd37 100644
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -39,7 +39,7 @@ RUN $(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends b
     $(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl || apk add --no-cache curl) && \
     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" && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
 # Entrypoint logic
diff --git a/emby/Dockerfile b/emby/Dockerfile
index 3099f3336..eb999b6f9 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -38,7 +38,7 @@ RUN $(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends b
     $(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl || apk add --no-cache curl) && \
     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" && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
 ##############
diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile
index 181ecc442..1537c5759 100644
--- a/mylar3/Dockerfile
+++ b/mylar3/Dockerfile
@@ -33,7 +33,7 @@ RUN $(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends b
     $(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl || apk add --no-cache curl) && \
     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" && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
     
 ##############
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 602d100e9..1710c7e53 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -62,7 +62,7 @@ RUN $(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends b
     $(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl || apk add --no-cache curl) && \
     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" && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
 
 ##############
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index f382bfffd..05b184403 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -34,7 +34,7 @@ RUN $(ls /bin/bash &>/dev/null) || (apt-get install -y --no-install-recommends b
     $(curl --help &>/dev/null) || (apt-get install -y --no-install-recommends curl || apk add --no-cache curl) && \
     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" && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
     rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE
     
 ##############