diff --git a/.templates/00-aaa_dockerfile_backup.sh b/.templates/00-aaa_dockerfile_backup.sh
index b83415148..8c98c3943 100755
--- a/.templates/00-aaa_dockerfile_backup.sh
+++ b/.templates/00-aaa_dockerfile_backup.sh
@@ -11,11 +11,11 @@ if [ -e "/MODULESFILE" ]; then
     echo "Executing modules script : $MODULES"
 
     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 &&
-        apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true &&
-        mkdir -p /etc/cont-init.d &&
-        for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done &&
-        chmod -R 755 /etc/cont-init.d
+    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 &&
+    apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true &&
+    mkdir -p /etc/cont-init.d &&
+    for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done &&
+    chmod -R 755 /etc/cont-init.d
 fi
 
 #######################
@@ -26,11 +26,11 @@ if [ -e "/ENVFILE" ]; then
     echo "Executing dependency script with custom elements : $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 &&
-        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 -f -L -s -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
+    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 -f -L -s -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
 
 if [ -e "/MODULESFILE" ] && [ ! -f /ha_entrypoint.sh ]; then
diff --git a/.templates/ha_automodules.sh b/.templates/ha_automodules.sh
index 379a377c9..727b09008 100755
--- a/.templates/ha_automodules.sh
+++ b/.templates/ha_automodules.sh
@@ -28,8 +28,8 @@ mkdir -p /etc/cont-init.d
 # Download scripts
 for scripts in $MODULES; do
     echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" &&
-        [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] ||
-        (echo "script failed to install $scripts" && exit 1)
+    [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] ||
+    (echo "script failed to install $scripts" && exit 1)
 done
 
 chmod -R 755 /etc/cont-init.d
diff --git a/.templates/ha_entrypoint.sh b/.templates/ha_entrypoint.sh
index 0e68b6863..7170b516b 100755
--- a/.templates/ha_entrypoint.sh
+++ b/.templates/ha_entrypoint.sh
@@ -9,7 +9,7 @@ echo "Starting..."
 for SCRIPTS in /etc/cont-init.d/*; do
     [ -e "$SCRIPTS" ] || continue
     echo "$SCRIPTS: executing"
-    
+
     # Ensure permissions
     chown "$(id -u)":"$(id -g)" "$SCRIPTS"
     chmod a+x "$SCRIPTS"
@@ -20,7 +20,7 @@ for SCRIPTS in /etc/cont-init.d/*; do
         for shebang in "/command/with-contenv bashio" "/usr/bin/env bashio" "/usr/bin/bashio" "/bin/bash" "/bin/sh"; do if [ -f "${shebang%% *}" ]; then break; fi; done
         sed -i "s|$currentshebang|$shebang|g" "$SCRIPTS"
     fi
-    
+
     # Start the script
     /./"$SCRIPTS" || echo -e "\033[0;31mError\033[0m : $SCRIPTS exiting $?"