diff --git a/Dockerfile b/Dockerfile
index 5c2403e..896a0d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG run_tests=true
 
 RUN apt-get update && apt-get install -y libzbar0 python3-opencv nano \
     && pip install -r requirements.txt \
-    && if [[ "$run_tests" == "true" ]] ; then /extract/run_pytest.sh ; else echo "Not running tests..." ; fi
+    && if [[ "$run_tests" == "true" ]]; then /extract/run_pytest.sh; else echo "Not running tests..."; fi
 
 WORKDIR /files
 
diff --git a/Dockerfile_no_qr_reader b/Dockerfile_no_qr_reader
index 535fe55..c1a2cc0 100644
--- a/Dockerfile_no_qr_reader
+++ b/Dockerfile_no_qr_reader
@@ -5,10 +5,12 @@ WORKDIR /extract
 COPY . .
 
 ARG run_tests=true
+ARG TARGETPLATFORM
 
-RUN apk add zlib-dev nano \
+RUN apk add nano \
+    && if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then apk add zlib-dev jpeg-dev; fi \
     && pip install protobuf qrcode Pillow \
-    && if [[ "$run_tests" == "true" ]] ; then /extract/run_pytest.sh test_extract_otp_secret_keys_pytest.py -k "not qreader" --relaxed ; else echo "Not running tests..." ; fi
+    && if [[ "$run_tests" == "true" ]]; then /extract/run_pytest.sh test_extract_otp_secret_keys_pytest.py -k "not qreader" --relaxed; else echo "Not running tests..."; fi
 
 WORKDIR /files