diff --git a/Dockerfile b/Dockerfile
index 7cd1c79..1c87411 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,21 +5,24 @@ RUN apt-get install -y --no-install-recommends \
     build-essential libxml2-utils git make gcc libtool libmhash-dev \
     asciidoc asciidoc-dblatex
 
-# Install deps
+# Build and install snakeoil
 RUN git clone https://github.com/pkgcore/snakeoil
+
 WORKDIR snakeoil
-RUN python -m setup bdist install
+RUN python -m setup bdist
 
-#RUN pip install snakeoil
-#RUN pip wheel snakeoil
+WORKDIR /
+RUN tar xvzf snakeoil/dist/snakeoil-*.tar.gz
 
-#RUN pip install git+https://github.com/dol-sen/pyDeComp
+# Build and install pyDeComp
 RUN git clone https://github.com/dol-sen/pyDeComp pydecomp
 
 WORKDIR pydecomp
-RUN python -m setup bdist install
+RUN python -m setup bdist
 
 WORKDIR /
+RUN tar xvzf pydecomp/dist/pyDeComp-.tar.gz
+
 # Clone catalyst repository
 RUN git clone https://anongit.gentoo.org/git/proj/catalyst.git catalyst
 
@@ -27,8 +30,9 @@ RUN git clone https://anongit.gentoo.org/git/proj/catalyst.git catalyst
 WORKDIR /catalyst
 RUN make && python -m setup bdist
 
-# Get and uncompress shash
 WORKDIR /
+
+# Get and uncompress shash
 RUN wget ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz \
     && tar xvzf shash-0.2.6.tar.gz