diff --git a/Dockerfile b/Dockerfile
index a66b45f..a2c96de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,68 +1,49 @@
-FROM quay.io/thallian/confd-env:latest
+FROM registry.gitlab.com/thallian/docker-confd-env:master
 
-ENV VERSION v0.22.0-rc2
+ENV VERSION v0.30.0-rc1
 
 RUN addgroup -g 2222 synapse
 RUN adduser -h /var/lib/synapse -u 2222 -D -G synapse synapse
 
 RUN apk add --no-cache \
     libressl \
-    bash \
-    coreutils \
-    curl \
-    file \
-    gcc \
-    libpq \
-    postgresql-dev \
-    libffi \
-    libffi-dev \
-    libjpeg-turbo \
-    libjpeg-turbo-dev \
-    libssl1.0 \
-    libtool \
-    libxml2 \
-    libxml2-dev \
-    libxslt \
-    libxslt-dev \
-    linux-headers \
-    make \
-    musl \
-    musl-dev \
-    libressl-dev \
-    pwgen \
-    py2-pip \
-    py-virtualenv \
     python2 \
-    python2-dev \
-    sqlite \
-    sqlite-libs \
-    unzip \
-    zlib \
-    zlib-dev
+    py2-pip \
+    py2-psycopg2 \
+    py2-cffi \
+    py2-msgpack \
+    py2-psutil \
+    py2-openssl \
+    py2-service_identity \
+    py2-yaml \
+    py2-pillow \
+    py2-asn1 \
+    py2-phonenumbers \
+    py2-six \
+    py2-netaddr \
+    py2-jsonschema \
+    py-jinja2 \
+    py-twisted \
+    py2-requests \
+    py2-future \
+    py2-tz \
+    py2-dateutil \
+    py2-olefile \
+    py2-markupsafe \
+    py2-zope-interface \
+    py2-simplejson \
+    py2-chardet \
+    py2-certifi \
+    py2-bcrypt
 
-RUN virtualenv -p python /var/lib/synapse
-RUN source /var/lib/synapse/bin/activate && \
-    pip install --upgrade setuptools && \
-    pip install psycopg2 && \
-    pip install https://github.com/matrix-org/synapse/tarball/$VERSION
+RUN apk --no-cache  --repository http://dl-3.alpinelinux.org/alpine/edge/main add py2-pynacl
 
-RUN apk del \
-    coreutils \
-    file \
-    gcc \
-    postgresql-dev \
-    libffi-dev \
-    libjpeg-turbo-dev \
-    libtool \
-    libxml2-dev \
-    libxslt-dev \
-    linux-headers \
-    make \
-    musl-dev \
-    libressl-dev \
-    python-dev \
-    sqlite-libs \
-    zlib-dev
+COPY py-affinity-0.1.0-r0.apk /tmp/py-affinity-0.1.0-r0.apk
+COPY py2-blist-1.3.6-r0.apk /tmp/py2-blist-1.3.6-r0.apk
+
+RUN apk --allow-untrusted add /tmp/py-affinity-0.1.0-r0.apk /tmp/py2-blist-1.3.6-r0.apk
+
+RUN pip install https://github.com/matrix-org/synapse/tarball/$VERSION
 
 ADD /rootfs /
 
diff --git a/py-affinity-0.1.0-r0.apk b/py-affinity-0.1.0-r0.apk
new file mode 100644
index 0000000..1fde1b8
Binary files /dev/null and b/py-affinity-0.1.0-r0.apk differ
diff --git a/py2-blist-1.3.6-r0.apk b/py2-blist-1.3.6-r0.apk
new file mode 100644
index 0000000..7af3874
Binary files /dev/null and b/py2-blist-1.3.6-r0.apk differ