diff --git a/images/lidarr/Dockerfile b/images/lidarr/Dockerfile
index 7304f7a..b9bafdf 100644
--- a/images/lidarr/Dockerfile
+++ b/images/lidarr/Dockerfile
@@ -9,17 +9,29 @@ ARG UBUNTU_VERSION
 # Install chisel and build rootfs with lidarr dependencies
 RUN \
     apt update \
-    && apt install file curl --yes \
-    && curl -L https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
-        | tar xzf - -C /usr/bin \
-    && curl -LO --output-dir /usr/bin https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
+    && apt install --yes \
+        # Needed to download chisel and chisel-wrapper \
+        curl \
+        # chisel-wrapper dependency \
+        file \
+    && curl \
+        --location \
+        https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
+            | tar xzf - --directory /usr/bin \
+    && curl \
+        --location \
+        --remote-name \
+        --output-dir /usr/bin \
+        https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
     && chmod +x /usr/bin/chisel-wrapper \
     && mkdir -p /rootfs/var/lib/dpkg \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
         --release ubuntu-${UBUNTU_VERSION} \
         --root /rootfs \
+        # Base filesystem \
         base-files_base \
         ca-certificates_data \
+        # lidarr dependencies \
         libicu74_libs \
         libsqlite3-0_libs \
         libssl3t64_libs \
@@ -40,9 +52,9 @@ RUN \
         'amd64') export ARCH='x64' ;; \
         'arm64') export ARCH='arm64' ;; \
     esac \
-    && curl -L "https://github.com/Lidarr/Lidarr/releases/download/v${VERSION}/Lidarr.master.${VERSION}.linux-core-${ARCH}.tar.gz" \
+    && curl --location "https://github.com/Lidarr/Lidarr/releases/download/v${VERSION}/Lidarr.master.${VERSION}.linux-core-${ARCH}.tar.gz" \
         | tar xzf - -C / \
-    && rm -rf /Lidarr/Lidarr.Update
+    && rm -r /Lidarr/Lidarr.Update
 
 FROM scratch
 COPY --from=builder /rootfs /
diff --git a/images/prowlarr/Dockerfile b/images/prowlarr/Dockerfile
index 485c358..751a49d 100644
--- a/images/prowlarr/Dockerfile
+++ b/images/prowlarr/Dockerfile
@@ -9,17 +9,29 @@ ARG UBUNTU_VERSION
 # Install chisel and build rootfs with prowlarr dependencies
 RUN \
     apt update \
-    && apt install file curl --yes \
-    && curl -L https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
-        | tar xzf - -C /usr/bin \
-    && curl -LO --output-dir /usr/bin https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
+    && apt install --yes \
+        # Needed to download chisel and chisel-wrapper \
+        curl \
+        # chisel-wrapper dependency \
+        file \
+    && curl \
+        --location \
+        https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
+            | tar xzf - --directory /usr/bin \
+    && curl \
+        --location \
+        --remote-name \
+        --output-dir /usr/bin \
+        https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
     && chmod +x /usr/bin/chisel-wrapper \
     && mkdir -p /rootfs/var/lib/dpkg \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
         --release ubuntu-${UBUNTU_VERSION} \
         --root /rootfs \
+        # Base filesystem \
         base-files_base \
         ca-certificates_data \
+        # prowlarr dependencies \
         libicu74_libs \
         libsqlite3-0_libs \
         libssl3t64_libs \
@@ -40,9 +52,9 @@ RUN \
         'amd64') export ARCH='x64' ;; \
         'arm64') export ARCH='arm64' ;; \
     esac \
-    && curl -L "https://github.com/Prowlarr/Prowlarr/releases/download/v${VERSION}/Prowlarr.master.${VERSION}.linux-core-${ARCH}.tar.gz" \
-        | tar xzf - -C / \
-    && rm -rf /Prowlarr/Prowlarr.Update
+    && curl --location "https://github.com/Prowlarr/Prowlarr/releases/download/v${VERSION}/Prowlarr.master.${VERSION}.linux-core-${ARCH}.tar.gz" \
+        | tar xzf - --directory / \
+    && rm -r /Prowlarr/Prowlarr.Update
 
 FROM scratch
 COPY --from=builder /rootfs /
diff --git a/images/qbittorrent/Dockerfile b/images/qbittorrent/Dockerfile
index b4058b6..e2ae310 100644
--- a/images/qbittorrent/Dockerfile
+++ b/images/qbittorrent/Dockerfile
@@ -9,15 +9,26 @@ ARG UBUNTU_VERSION
 # Install chisel and build rootfs
 RUN \
     apt update \
-    && apt install file curl --yes \
-    && curl -L https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
-        | tar xzf - -C /usr/bin \
-    && curl -LO --output-dir /usr/bin https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
+    && apt install --yes \
+        # Needed to download chisel and chisel-wrapper \
+        curl \
+        # chisel-wrapper dependency \
+        file \
+    && curl \
+        --location \
+        https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
+            | tar xzf - --directory /usr/bin \
+    && curl \
+        --location \
+        --remote-name \
+        --output-dir /usr/bin \
+        https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
     && chmod +x /usr/bin/chisel-wrapper \
     && mkdir -p /rootfs/var/lib/dpkg \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
         --release ubuntu-${UBUNTU_VERSION} \
         --root /rootfs \
+        # Base filesystem \
         base-files_base \
         ca-certificates_data \
     && useradd \
@@ -28,7 +39,7 @@ RUN \
         nonroot \
     && rm /rootfs/etc/.pwd.lock \
     && mkdir -p /rootfs/config/qBittorrent/config \
-    && chown -R 1000 /rootfs/config
+    && chown --recursive 1000 /rootfs/config
 
 # Download qbittorrent
 RUN \
@@ -36,7 +47,10 @@ RUN \
         'amd64') export ARCH='x86_64' ;; \
         'arm64') export ARCH='aarch64' ;; \
     esac \
-    && curl -L -o /qbittorrent-nox "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${RELEASE}/${ARCH}-qbittorrent-nox" \
+    && curl \
+        --location \
+        --output /qbittorrent-nox \
+        "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${RELEASE}/${ARCH}-qbittorrent-nox" \
     && chmod +x /qbittorrent-nox
 
 FROM scratch
diff --git a/images/radarr/Dockerfile b/images/radarr/Dockerfile
index 125ffab..34ff37e 100644
--- a/images/radarr/Dockerfile
+++ b/images/radarr/Dockerfile
@@ -9,17 +9,29 @@ ARG UBUNTU_VERSION
 # Install chisel and build rootfs with radarr dependencies
 RUN \
     apt update \
-    && apt install file curl --yes \
-    && curl -L https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
-        | tar xzf - -C /usr/bin \
-    && curl -LO --output-dir /usr/bin https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
+    && apt install --yes \
+        # Needed to download chisel and chisel-wrapper \
+        curl \
+        # chisel-wrapper dependency \
+        file \
+    && curl \
+        --location \
+        https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
+            | tar xzf - --directory /usr/bin \
+    && curl \
+        --location \
+        --remote-name \
+        --output-dir /usr/bin \
+        https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
     && chmod +x /usr/bin/chisel-wrapper \
     && mkdir -p /rootfs/var/lib/dpkg \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
         --release ubuntu-${UBUNTU_VERSION} \
         --root /rootfs \
+        # Base filesystem \
         base-files_base \
         ca-certificates_data \
+        # radarr dependencies \
         libicu74_libs \
         libsqlite3-0_libs \
         libssl3t64_libs \
@@ -40,9 +52,9 @@ RUN \
         'amd64') export ARCH='x64' ;; \
         'arm64') export ARCH='arm64' ;; \
     esac \
-    && curl -L "https://github.com/Radarr/Radarr/releases/download/v${VERSION}/Radarr.master.${VERSION}.linux-core-${ARCH}.tar.gz" \
-        | tar xzf - -C / \
-    && rm -rf /Radarr/Radarr.Update
+    && curl --location "https://github.com/Radarr/Radarr/releases/download/v${VERSION}/Radarr.master.${VERSION}.linux-core-${ARCH}.tar.gz" \
+        | tar xzf - --directory / \
+    && rm -r /Radarr/Radarr.Update
 
 FROM scratch
 COPY --from=builder /rootfs /
diff --git a/images/sonarr/Dockerfile b/images/sonarr/Dockerfile
index 45fd41b..6040ca7 100644
--- a/images/sonarr/Dockerfile
+++ b/images/sonarr/Dockerfile
@@ -9,17 +9,29 @@ ARG UBUNTU_VERSION
 # Install chisel and build rootfs with sonarr dependencies
 RUN \
     apt update \
-    && apt install file curl --yes \
-    && curl -L https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
-        | tar xzf - -C /usr/bin \
-    && curl -LO --output-dir /usr/bin https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
+    && apt install --yes \
+        # Needed to download chisel and chisel-wrapper \
+        curl \
+        # chisel-wrapper dependency \
+        file \
+    && curl \
+        --location \
+        https://github.com/canonical/chisel/releases/download/${CHISEL_VERSION}/chisel_${CHISEL_VERSION}_linux_${TARGETARCH}.tar.gz \
+            | tar xzf - --directory /usr/bin \
+    && curl \
+        --location \
+        --remote-name \
+        --output-dir /usr/bin \
+        https://raw.githubusercontent.com/canonical/rocks-toolbox/main/chisel-wrapper \
     && chmod +x /usr/bin/chisel-wrapper \
     && mkdir -p /rootfs/var/lib/dpkg \
     && chisel-wrapper --generate-dpkg-status /rootfs/var/lib/dpkg/status -- \
         --release ubuntu-${UBUNTU_VERSION} \
         --root /rootfs \
+        # Base filesystem \
         base-files_base \
         ca-certificates_data \
+        # sonarr dependencies \
         libicu74_libs \
         libsqlite3-0_libs \
         libssl3t64_libs \
@@ -40,9 +52,9 @@ RUN \
         'amd64') export ARCH='x64' ;; \
         'arm64') export ARCH='arm64' ;; \
     esac \
-    && curl -L "https://github.com/Sonarr/Sonarr/releases/download/v${VERSION}/Sonarr.main.${VERSION}.linux-${ARCH}.tar.gz" \
-        | tar xzf - -C / \
-    && rm -rf /Sonarr/Sonarr.Update
+    && curl --location "https://github.com/Sonarr/Sonarr/releases/download/v${VERSION}/Sonarr.main.${VERSION}.linux-${ARCH}.tar.gz" \
+        | tar xzf - --directory / \
+    && rm -r /Sonarr/Sonarr.Update
 
 FROM scratch
 COPY --from=builder /rootfs /