diff --git a/doublecommander/Dockerfile b/doublecommander/Dockerfile
index 89ee94a41..02cad31a1 100644
--- a/doublecommander/Dockerfile
+++ b/doublecommander/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM ${BUILD_FROM}
+ARG BASHIO_VERSION=0.13.1
 
 # Install bashio
 RUN apt-get update \
@@ -8,19 +9,22 @@ RUN apt-get update \
     jq \
     samba \
     smbclient \
-    && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
-    && mkdir /tmp/bashio \
-    && tar zxvf \
-    /tmp/bashio.tar.gz \
-    --strip 1 -C /tmp/bashio \
+    ##################
+    # Install bashio #
+    ##################
+    && mkdir -p /tmp/bashio \
+    && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
+    | tar -xzf - --strip 1 -C /tmp/bashio \
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -rf /tmp/bashio \
     \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     && rm -fr \
     /tmp/* \
-    /var/{cache,log}/* \
     /var/lib/apt/lists/* \
+    \
     # Allow UID and GID setting
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index 5cf0e1a09..4bb1cf316 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -1,27 +1,32 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM wiserain/flexget:latest
+ARG BASHIO_VERSION=0.13.1
 
 RUN \
     ##################
-    # Install bashio #
+    # Install apps #
     ##################
     apk add --no-cache \
     jq \
     curl \
     cifs-utils \
     \
-    && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
-    && mkdir /tmp/bashio \
-    && tar zxvf \
-    /tmp/bashio.tar.gz \
-    --strip 1 -C /tmp/bashio \
+    ##################
+    # Install bashio #
+    ##################
+    && mkdir -p /tmp/bashio \
+    && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
+    | tar -xzf - --strip 1 -C /tmp/bashio \
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -rf /tmp/bashio \
     \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     && rm -fr \
     /tmp/* \
+    /var/lib/apt/lists/* \
     \
     ###############
     # Adapt image #
@@ -40,7 +45,7 @@ RUN \
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/20-config \
     && sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); fi/g' /etc/cont-init.d/20-config \
     && sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); fi/g' /etc/cont-init.d/20-config
-	
+
 VOLUME [ "/data" ]
 
 ### LABELS
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index f05f4afa7..e0a7eaadf 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -1,10 +1,10 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM ${BUILD_FROM}
-
+ARG BASHIO_VERSION=0.13.1
 
 RUN curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
     /tmp/bashio.tar.gz \
diff --git a/joal/Dockerfile b/joal/Dockerfile
index 5f46923ac..dc7a3a533 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -7,18 +7,19 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ARG BUILD_VERSION
 ARG BUILD_UPSTREAM="2.1.26"
+ARG BASHIO_VERSION=0.13.1
 
 RUN \
-#Install bashio
+    #Install bashio
     apt-get clean \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
     wget \
     jq \
     nginx \
-#Install bashio
+    #Install bashio
     && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
     /tmp/bashio.tar.gz \
@@ -27,12 +28,12 @@ RUN \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     \
-#Install Joal
+    #Install Joal
     && wget -O /tmp/joal.tar.gz "https://github.com/anthonyraymond/joal/releases/download/$BUILD_UPSTREAM/joal.tar.gz" \
     && mkdir -p /data/joal \
     && tar zxvf /tmp/joal.tar.gz -C /data/joal \
     && rm /data/joal/jack-of* \
-#Clean
+    #Clean
     && rm -fr \
     /tmp/* \
     /var/{cache,log}/* \
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index 4d2a754b1..d607c0977 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -6,6 +6,7 @@ FROM ${BUILD_FROM}
 
 ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
 ARG BUILD_ARCH
+ARG BASHIO_VERSION=0.13.1
 
 # Add bashio
 RUN \
@@ -15,7 +16,7 @@ RUN \
     && apk add --no-cache \
     curl jq \
     && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
     /tmp/bashio.tar.gz \
@@ -27,7 +28,7 @@ RUN \
     \
     #gclib compatibility 
     && apk add --no-cache gcompat@community || true
-    
+
 RUN \
     # modify/copy files
     sed -i "s|data|share/nextcloud|g" /etc/cont-init.d/* \
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index dfdbcf8ee..feef9d212 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM ${BUILD_FROM}
+ARG BASHIO_VERSION=0.13.1
 
 RUN \
     ################
@@ -18,7 +19,7 @@ RUN \
     # Install bashio #
     ##################
     && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
     /tmp/bashio.tar.gz \
diff --git a/papermerge/rootfs/etc/cont-init.d/00-aaa_bashio b/papermerge/rootfs/etc/cont-init.d/00-aaa_bashio
index da75b87ad..ae1f4cb7e 100644
--- a/papermerge/rootfs/etc/cont-init.d/00-aaa_bashio
+++ b/papermerge/rootfs/etc/cont-init.d/00-aaa_bashio
@@ -18,10 +18,10 @@ if [ ! -f "/usr/bin/bashio" ]; then
     ###################
     # Install bashio #
     ##################
-    BASHIO_VERSION="0.13.1"
+    BASHIO_VERSION=0.13.1
     mkdir -p /tmp/bashio
-    curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
-    | tar -xzf - --strip 1 -C /tmp/bashio
+    curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" |
+        tar -xzf - --strip 1 -C /tmp/bashio
     mv /tmp/bashio/lib /usr/lib/bashio
     ln -s /usr/lib/bashio/bashio /usr/bin/bashio
     rm -rf /tmp/bashio
diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile
index b6d8c0bb4..bfe78f93c 100644
--- a/piwigo/Dockerfile
+++ b/piwigo/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM ${BUILD_FROM}
+ARG BASHIO_VERSION=0.13.1
 
 # Copy root filesystem
 COPY rootfs / 
@@ -15,7 +16,7 @@ RUN \
     cifs-utils \
     \
     && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
     /tmp/bashio.tar.gz \
@@ -30,8 +31,8 @@ RUN \
     && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
     && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
-    # Use subfolder in config
-    # Protect files starting by config.
+# Use subfolder in config
+# Protect files starting by config.
 #    && files=$(grep -rl '/config.' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config.|/temptemp.|g' \
 #    && files=$(grep -rl '/config' /defaults/*) && echo $files | xargs sed -i 's|/config|/share/piwigo|g' \
 #    && files=$(grep -rl '/config' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config|/share/piwigo|g' \
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index d88356aee..b0a6bf25e 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM ${BUILD_FROM}
+ARG BASHIO_VERSION=0.13.1
 
 RUN \
     ################
@@ -20,7 +21,7 @@ RUN \
     # Install bashio #
     ##################
     && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
     /tmp/bashio.tar.gz \
diff --git a/transmission/Dockerfile b/transmission/Dockerfile
index 37e5a3387..3a6e9699c 100644
--- a/transmission/Dockerfile
+++ b/transmission/Dockerfile
@@ -1,6 +1,7 @@
 ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM ${BUILD_FROM}
+ARG BASHIO_VERSION=0.13.1
 
 # Add bashio
 RUN apk add --no-cache \
@@ -9,7 +10,7 @@ RUN apk add --no-cache \
     samba \
     samba-client \
     && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
     /tmp/bashio.tar.gz \
diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile
index 5bb62d4d1..37a01632b 100644
--- a/ubooquity/Dockerfile
+++ b/ubooquity/Dockerfile
@@ -2,6 +2,7 @@ ARG BUILD_FROM
 ARG BUILD_VERSION
 ARG BUILD_UPSTREAM="2.1.2"
 FROM ${BUILD_FROM}
+ARG BASHIO_VERSION=0.13.1
 
 # Copy root filesystem
 COPY rootfs / 
@@ -11,9 +12,9 @@ RUN apk add --no-cache \
     curl \
     jq \
     moreutils \
-	samba \
+    samba \
     && curl -J -L -o /tmp/bashio.tar.gz \
-    "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
+    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
     /tmp/bashio.tar.gz \
diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index 21a1c6473..f9e5a641f 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -10,6 +10,7 @@ ENV WEBTREES_HOME="/data/webtrees"
 WORKDIR $WEBTREES_HOME
 ENTRYPOINT ["/start.sh"]
 VOLUME ["/data"]
+ARG BASHIO_VERSION=0.13.1
 
 RUN \
     ################
@@ -18,8 +19,8 @@ RUN \
     apt-get clean \
     && apt-get update \
     && apt-get install -y \
-        jq \
-        curl \
+    jq \
+    curl \
     && apt-get clean \
     \
     ##################
@@ -44,18 +45,18 @@ RUN \
     # Add end script
     && sed -i '$ d' /docker-entrypoint.sh
 
-    # Change data location
+# Change data location
 #    && cp -rn /var/www/webtrees /data \
 #    && mkdir -p /data/webtrees \
 #    && chown -R www-data:www-data /data/webtrees \
-    # Use data from addon options for all values
+# Use data from addon options for all values
 #&& sed -i 's|cat \"\$|jq ."|g' /docker-entrypoint.sh \
 #&& sed -i 's|_FILE" 2> /dev/null| //empty" /data/options.json|g' /docker-entrypoint.sh \
-    #&& chown root:root /end.sh \
-    #&& chmod a+x /end.sh \
-    #&& sed -i "2 i\cd / && ./start.sh" /docker-entrypoint.sh \
-    #&& sed -i '$ i\export DB_NAME=$DB_NAME && export WT_USER=$WT_USER && export WT_PASS=$WT_PASS && cd / && ./end.sh' /docker-entrypoint.sh
-    
+#&& chown root:root /end.sh \
+#&& chmod a+x /end.sh \
+#&& sed -i "2 i\cd / && ./start.sh" /docker-entrypoint.sh \
+#&& sed -i '$ i\export DB_NAME=$DB_NAME && export WT_USER=$WT_USER && export WT_PASS=$WT_PASS && cd / && ./end.sh' /docker-entrypoint.sh
+
 ### LABELS
 ARG BUILD_ARCH
 ARG BUILD_DATE