diff --git a/Dockerfile b/Dockerfile
index f1d6860..0fb7550 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,14 +8,20 @@ RUN apt-get install -y --no-install-recommends \
 # Install deps
 RUN pip install snakeoil
 
-RUN pip install git+https://github.com/dol-sen/pyDeComp
+#RUN pip install git+https://github.com/dol-sen/pyDeComp
+RUN git clone https://github.com/dol-sen/pyDeComp pydecomp
 
+WORKDIR pydecomp
+RUN python -m setup bdist
+#RUN python -m setup install
+
+WORKDIR /
 # Clone catalyst repository
 RUN git clone https://anongit.gentoo.org/git/proj/catalyst.git catalyst
 
 # Build and install catalyst
 WORKDIR /catalyst
-RUN make && python -m setup install
+RUN make && python -m setup bdist
 
 # Get and uncompress shash
 WORKDIR /
@@ -33,26 +39,13 @@ FROM python:3.6-alpine
 
 RUN apk add coreutils
 
-COPY --from=base /usr/local/lib/python3.6/site-packages/snakeoil-* \
-                 /usr/local/lib/python3.6/site-packages/
-COPY --from=base /usr/local/lib/python3.6/site-packages/snakeoil \
-                 /usr/local/lib/python3.6/site-packages/snakeoil
+RUN pip install snakeoil
 
-COPY --from=base /usr/local/lib/python3.6/site-packages/DeComp-* \
-                 /usr/local/lib/python3.6/site-packages/
-COPY --from=base /usr/local/lib/python3.6/site-packages/DeComp \
-                 /usr/local/lib/python3.6/site-packages/DeComp
+COPY --from=base /pydecomp/dist/pyDeComp-*.tar.gz ./
+RUN tar -xzf pyDeComp-*.tar.gz && rm pyDeComp-*.tar.gz
 
-COPY --from=base /usr/local/lib/python3.6/site-packages/catalyst-* \
-                 /usr/local/lib/python3.6/site-packages/
-COPY --from=base /usr/local/lib/python3.6/site-packages/catalyst \
-                 /usr/local/lib/python3.6/site-packages/catalyst
-
-COPY --from=base /usr/local/share/catalyst /usr/local/share
-
-COPY --from=base /etc/catalyst /etc/
-
-COPY --from=base /usr/local/bin/catalyst /usr/local/bin/catalyst
+COPY --from=base /catalyst/dist/catalyst-*.tar.gz ./
+RUN tar -xzf catalyst-*.tar.gz && rm catalyst-*.tar.gz
 
 COPY --from=base /usr/local/bin/shash /usr/local/bin/shash