diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile
index ff2d51eba..bd751b3bc 100644
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -25,10 +25,7 @@ RUN \
     | 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 \
-    \
-    /var/{cache,log}/* \
-    /var/lib/apt/lists/*
+    && rm -rf /tmp/bashio
 
 # Copy root filesystem
 COPY rootfs / 
diff --git a/code-server/Dockerfile b/code-server/Dockerfile
index e38ffb010..55ac1af54 100644
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -17,11 +17,6 @@ RUN apt-get update \
     && 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/* \
     # 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/doublecommander/Dockerfile b/doublecommander/Dockerfile
index 1bb29902d..6fc51b6e1 100644
--- a/doublecommander/Dockerfile
+++ b/doublecommander/Dockerfile
@@ -19,12 +19,6 @@ RUN apt-get update \
     && 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/* \
-    \
     # 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/emby/Dockerfile b/emby/Dockerfile
index 36934b54c..81abc0e48 100644
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -30,9 +30,6 @@ RUN \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     && rm -rf /tmp/bashio \
     \
-    /var/{cache,log}/* \
-    /var/lib/apt/lists/* \
-    \
     #############################
     # Allow UID and GID setting #
     #############################
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
index 4bb1cf316..a2ab0c520 100644
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -22,12 +22,6 @@ RUN \
     && 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 #
     ###############
diff --git a/jackett/Dockerfile b/jackett/Dockerfile
index ddca6e1b8..e59206a04 100644
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -3,7 +3,11 @@ ARG BUILD_VERSION
 FROM ${BUILD_FROM}
 ARG BASHIO_VERSION=0.13.1
 
-RUN curl -J -L -o /tmp/bashio.tar.gz \
+RUN \
+    ##################
+    # Install bashio #
+    ##################
+    curl -J -L -o /tmp/bashio.tar.gz \
     "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
     && tar zxvf \
diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile
index b8ffd6513..3d3cf7d89 100644
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -25,10 +25,6 @@ RUN apt-get update \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     && rm -rf /tmp/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/joal/Dockerfile b/joal/Dockerfile
index c877ec311..506982a64 100644
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -17,7 +17,9 @@ RUN \
     wget \
     jq \
     nginx \
-    #Install bashio
+    ##################
+    # Install bashio #
+    ##################
     && curl -J -L -o /tmp/bashio.tar.gz \
     "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
     && mkdir /tmp/bashio \
diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile
index b0d49170b..575bf275e 100644
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -11,7 +11,9 @@ ARG BASHIO_VERSION=0.13.1
 # Add bashio
 RUN \
     echo "Install version $BUILD_VERSION on $BUILD_ARCH" \
-    #Install bashio
+    ##################
+    # Install bashio #
+    ##################
     && echo "**** Install Bashio ****" \
     && apk add --no-cache \
     curl jq \
diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile
index 5bcfd86db..136bc1320 100644
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -19,7 +19,7 @@ RUN \
     samba \
     smbclient \
     \ 
-    ###################
+    ##################
     # Install bashio #
     ##################
     && mkdir -p /tmp/bashio \
diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile
index 3e29ea8a8..26fe9e3e7 100644
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -33,9 +33,6 @@ RUN \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     && rm -rf /tmp/bashio \
     \
-    /var/{cache,log}/* \
-    /var/lib/apt/lists/* \
-    \ 
     ###################
     # Configure image #
     ###################
diff --git a/plex/Dockerfile b/plex/Dockerfile
index fcb76faa9..83df1211e 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -32,9 +32,6 @@ RUN \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
     && rm -rf /tmp/bashio \
     \
-    /var/{cache,log}/* \
-    /var/lib/apt/lists/* \
-    \
     #############################
     # Allow UID and GID setting #
     #############################
diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile
index f105f0a46..7a8153e9a 100644
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -17,7 +17,7 @@ RUN \
     samba \
     smbclient \
     \ 
-    ###################
+    ##################
     # Install bashio #
     ##################
     && mkdir -p /tmp/bashio \
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index 3f1dddc8d..31c558cc9 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -26,13 +26,16 @@ RUN \
         "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \
     && chmod a+x /usr/bin/tempio \
     \
-# Install 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 \
+    | 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 \
+    \
 # 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 \