diff --git a/Dockerfile b/Dockerfile
index 98b9385d..6eed021a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,33 @@
-#webrecorder/webrecore 1.0
-
 FROM python:3.5.2
 
-RUN pip install gevent uwsgi bottle urllib3 youtube-dl
+MAINTAINER Ilya Kreymer <ikreymer at gmail.com>
 
-RUN pip install git+https://github.com/ikreymer/pywb.git@master#egg=pywb-0.33.0
-#RUN pip install pywb
+RUN mkdir /uwsgi
+COPY uwsgi.ini /uwsgi/
 
+RUN pip install gevent==1.1.2 certauth youtube-dl boto uwsgi urllib3
 RUN pip install git+https://github.com/t0m/pyamf.git@python3
+RUN pip install webassets pyyaml brotlipy
 
-RUN pip install boto webassets
+RUN mkdir /pywb
+ADD setup.py /pywb
+ADD README.rst /pywb
+ADD ./pywb /pywb/pywb
+RUN cd pywb; python setup.py install
 
-ADD . /webrecore/
-WORKDIR /webrecore/
+RUN mkdir /webarchive
+COPY config.yaml /webarchive/
 
-RUN pip install -e ./
+VOLUME /webarchive
 
-RUN useradd -ms /bin/bash -u 1000 apprun
+WORKDIR /webarchive
 
-USER apprun
+EXPOSE 8080
+
+CMD ["uwsgi", "/uwsgi/uwsgi.ini"]
+
+RUN useradd -ms /bin/bash -u 1000 archivist
+
+USER archivist