diff --git a/Dockerfile b/Dockerfile
index f098219..7547ada 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,32 @@
-FROM python:3.6-alpine as base
+FROM python:3.6-stretch as base
 
-RUN apk add --no-cache --virtual .build-deps \
-        git make gcc musl-dev asciidoc \
-    \
-    # Install deps
-    && pip install snakeoil \
-    && pip install git+https://github.com/dol-sen/pyDeComp \
-    \
-    # Clone catalyst repository
-    && git clone https://anongit.gentoo.org/git/proj/catalyst.git catalyst \
-    \
-    # Build and install catalyst
-    && cd /catalyst \
-    && make \
-    && python -m setup install \
-    \
-    # Get shash
-    && cd / \
-    && wget ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz \
-    && tar xvzf shash-0.2.6.tar.gz \
-    && cd shash-0.2.6 \
-    && ./configure --build=x86_64 \
-    && make && make install \
-    \
-    # Cleanup
-    && cd / \
-    && rm -Rf catalyst \
-    && apk del .build-deps
+RUN aptitude update
+RUN aptitude install \
+    build-essentials git make gcc libtool libmhash-dev asciidoc
+
+# Install deps
+RUN pip install snakeoil
+
+RUN pip install git+https://github.com/dol-sen/pyDeComp
+
+# 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
+
+# Get and uncompress shash
+WORKDIR /
+RUN wget ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz \
+    && tar xvzf shash-0.2.6.tar.gz
+
+# Build shash
+WORKDIR shash-0.2.6
+RUN cp /usr/share/libtool/build-aux/missing ./ \
+    && ./configure && make && make install \
+
+WORKDIR /
 
 FROM python:3.6-alpin as base