diff --git a/Dockerfile b/Dockerfile
index dcf5310..616bf82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,42 @@
 FROM ubuntu:latest
 
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 WORKDIR /app
 
-# Copy the current directory into the container at /app
-COPY . /app
-
-# Install necessary packages
 RUN apt-get update && apt-get install -y \
     # Mach build tools
-    build-essential make msitools wget unzip rustc \
+    build-essential \
+    make \
+    msitools \
+    wget \
+    unzip \
     # Python
-    python3 python3-dev python3-pip \
+    python3 \
+    python3-dev \
+    python3-pip \
     # Camoufox build system tools
-    git p7zip-full golang-go aria2 curl \
+    git \
+    p7zip-full \
+    golang-go \
+    aria2 \
+    curl \
+    rsync \
     # CA certificates
     ca-certificates \
-    && update-ca-certificates
+    && update-ca-certificates \
+    && curl https://sh.rustup.rs -sSf | bash -s -- -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
+COPY . .
 
-# Fetch Firefox & apply initial patches
+# Run setup and bootstrap
 RUN make setup-minimal && \
     make mozbootstrap && \
-    mkdir /app/dist
+    mkdir -p /app/dist
 
-# Mount .mozbuild directory and dist folder
-VOLUME /root/.mozbuild
-VOLUME /app/dist
+VOLUME ["/root/.mozbuild", "/app/dist"]
 
 ENTRYPOINT ["python3", "./multibuild.py"]