diff --git a/Dockerfile b/Dockerfile
index ae60e2016..9fa6e59e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
-	automake \
+        automake \
         bash \
         bc \
         binutils \
@@ -31,13 +31,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         file \
         git \
         graphviz \
-	help2man \
+        help2man \
         jq \
         make \
         ncurses-dev \
         openssh-client \
         patch \
         perl \
+        pigz \
         python3 \
         python3-matplotlib \
         python-is-python3 \
@@ -45,7 +46,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         rsync \
         skopeo \
         sudo \
-	texinfo \
+        texinfo \
         unzip \
         vim \
         wget \
diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh
index 40fac8cd5..245d7093f 100755
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -100,5 +100,5 @@ function convert_disk_image_zip() {
     hdd_img="$(hassos_image_name "${hdd_ext}")"
 
     rm -f "${hdd_img}.zip"
-    zip -j -m -q -r "${hdd_img}.zip" "${hdd_img}"
+    pigz -q -K -S ".zip" "${hdd_img}"
 }