diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index c7a6a430d..6deb8d36a 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -9,47 +9,59 @@ ARG TEMPIO_VERSION=2021.01.0
 ARG BUILD_ARCH
 
 RUN \
-    # Install apps
+    ################
+    # Install apps #
+    ################
     apt-get update \
     && apt-get install -y \
-    jq \
-    curl \
-    cifs-utils \
-    nginx \
-    coreutils \
-    openvpn \
+        jq \
+        curl \
+        cifs-utils \
+        nginx \
+        coreutils \
+        openvpn \
     \    
-    # Install tempio
+    ##################
+    # Install tempio #
+    ##################
     && curl -L -f -s -o /usr/bin/tempio \
     "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 \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -rf /tmp/bashio
-
-# Copy root filesystem
-COPY rootfs / 
-
-RUN \
+    && rm -rf /tmp/bashio \
+    \
+    ########################################
+    # Correct upstream image folders links #
+    ########################################
+    \
     # Allow UID and GID setting
-    sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
+    && 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 \
+    \
     # Correct permissions 
     && sed -i 's|/config|/config/qBittorrent|g' /etc/cont-init.d/10-adduser \    
     && sed -i 's=	/config=/config/qBittorrent /config/data/qBittorrent || true=g' /etc/cont-init.d/30-config \
+    \
     # Set download folder to /share
     && sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \
+    \
     # Remove fixed folders, allows connection to webUI
     && sed '11,13d' /defaults/qBittorrent.conf \ 
     && echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
     && echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf
 
+# Copy root filesystem
+COPY rootfs / 
+
 VOLUME [ "/data" ]
 
 ### LABELS