diff --git a/Dockerfile b/Dockerfile
index 7839cfa0..1274c7fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,33 +1,42 @@
 FROM alpine:3.11 
 
-#Base settings
+# Base settings
 ENV HOME /root
 
+# Install packages
+
+RUN apk --update --no-cache --no-progress add \
+    python3 python3-dev \
+    libffi-dev musl-dev \
+    gcc g++ make \
+    automake autoconf libtool \
+    openssl \
+    tor
+
 COPY requirements.txt /root/requirements.txt
 
-#Install ZeroNet
-RUN apk --update --no-cache --no-progress add python3 python3-dev gcc libffi-dev musl-dev make tor openssl \
- && pip3 install -r /root/requirements.txt \
+RUN pip3 install -r /root/requirements.txt \
  && apk del python3-dev gcc libffi-dev musl-dev make \
  && echo "ControlPort 9051" >> /etc/tor/torrc \
  && echo "CookieAuthentication 1" >> /etc/tor/torrc
- 
+
 RUN python3 -V \
  && python3 -m pip list \
  && tor --version \
  && openssl version
 
-#Add Zeronet source
+# Add Zeronet source
+
 COPY . /root
 VOLUME /root/data
 
-#Control if Tor proxy is started
+# Control if Tor proxy is started
 ENV ENABLE_TOR false
 
 WORKDIR /root
 
-#Set upstart command
+# Set upstart command
 CMD (! ${ENABLE_TOR} || tor&) && python3 zeronet.py --ui_ip 0.0.0.0 --fileserver_port 26552
 
-#Expose ports
+# Expose ports
 EXPOSE 43110 26552