diff --git a/APKBUILD b/APKBUILD
new file mode 100644
index 0000000..684b807
--- /dev/null
+++ b/APKBUILD
@@ -0,0 +1,32 @@
+pkgname=py3-twisted
+_pkgname=Twisted
+pkgver=17.1.0
+pkgrel=0
+pkgdesc="Asynchronous networking framework written in Python."
+url="http://twistedmatrix.com/"
+arch="all"
+license="MIT"
+depends="py3-crypto py3-zope-interface"
+makedepends="python3-dev py3-setuptools libtirpc-dev"
+install=""
+subpackages="$pkgname-doc"
+source="https://twistedmatrix.com/Releases/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2"
+builddir="$srcdir"/"$_pkgname"-$pkgver
+
+build() {
+    cd "$builddir"
+    CFLAGS="$CFLAGS `pkgconf --cflags libtirpc`" python3 setup.py build || return 1
+}
+
+package() {
+    cd "$builddir"
+    python3 setup.py install --prefix=/usr --root="$pkgdir" || return 1
+    install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+    _mans="pyhtmlizer.1 trial.1 twistd.1"
+    for _man in $_mans; do
+        install -m644 -D "$builddir"/docs/core/man/$_man \
+            "$pkgdir"/usr/share/man/man1/$_man  || return 1
+    done
+}
+
+sha512sums="e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966  Twisted-17.1.0.tar.bz2"
diff --git a/Dockerfile b/Dockerfile
index e71904a..cf8d84d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,49 +1,62 @@
+FROM alpine:3.8 AS builder
+
+RUN apk add --no-cache \
+    alpine-sdk \
+    py3-crypto \
+    py3-zope-interface \
+    python3-dev \
+    py3-setuptools \
+    libtirpc-dev
+
+RUN adduser -h /var/lib/builder -u 2222 -D -G abuild builder
+
+COPY APKBUILD /var/lib/builder/APKBUILD
+
+WORKDIR /var/lib/builder/
+USER builder
+
+RUN abuild-keygen -a -n
+RUN abuild -r
+
 FROM thallian/confd-env:latest
 
-ENV VERSION v0.33.9
+ENV VERSION v0.34.0
 
 RUN addgroup -g 2222 matrix-synapse
 RUN adduser -h /var/lib/matrix-synapse -u 2222 -D -G matrix-synapse matrix-synapse
 
 RUN apk add --no-cache \
     libressl \
-    python2 \
-    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
+    python3 \
+    py3-jsonschema \
+    py3-pynacl \
+    py3-cffi \
+    py3-service_identity \
+    py3-openssl \
+    py3-yaml \
+    py3-asn1 \
+    py3-asn1-modules \
+    py3-bcrypt \
+    py3-pillow \
+    py3-psutil \
+    py3-msgpack \
+    py3-phonenumbers \
+    py3-attrs \
+    py3-netaddr \
+    py3-jinja2 \
+    py3-psycopg2 \
+    py3-simplejson \
+    py3-zope-interface \
+    py3-requests \
+    py3-defusedxml \
+    py3-future \
+    py3-dateutil \
+    py3-ldap3
 
-RUN apk --no-cache  --repository http://dl-3.alpinelinux.org/alpine/edge/main add py2-pynacl
+COPY --from=builder /var/lib/builder/packages/lib/x86_64/py3-twisted-17.1.0-r0.apk /tmp/py3-twisted.apk
+RUN apk --allow-untrusted add /tmp/py3-twisted.apk
 
-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
+RUN pip3 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
deleted file mode 100644
index 1fde1b8..0000000
Binary files a/py-affinity-0.1.0-r0.apk and /dev/null differ
diff --git a/py2-blist-1.3.6-r0.apk b/py2-blist-1.3.6-r0.apk
deleted file mode 100644
index 7af3874..0000000
Binary files a/py2-blist-1.3.6-r0.apk and /dev/null differ