diff --git a/README.md b/README.md
index b695526..500845c 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,4 @@ No guarantee for completeness or functionality.
 |:--|:-----|:----------|:----:|:-----:|
 |[dragonchaser/webtest](https://hub.docker.com/r/dragonchaser/webtest)|webtest|A small container running ruby WebRick and serves static content from /web|x|x|
 |[dragonchaser/nginx-matrix](https://hub.docker.com/r/dragonchaser/nginx-matrix)|nginx-matrix|A modification of the nginx:latest image that exposes tcp ports 80,443 and 8448 for use as reverse proxy with a matrix server (e.g. synapse)|x|x|
+|[dragonchaser/matrix-synapse](https://hub.docker.com/r/dragonchaser/matrix-synapse)|matrix-synapse|**WIP** A container running the matrix reference server synapse|x|x|
diff --git a/matrix-synapse/Dockerfile b/matrix-synapse/Dockerfile
new file mode 100644
index 0000000..62d9a03
--- /dev/null
+++ b/matrix-synapse/Dockerfile
@@ -0,0 +1,6 @@
+FROM debian:latest
+LABEL maintainer="dragonchaser <crichter@suse.de>"
+RUN apt-get update && apt-get install -y python3-pip libopenjp2-7 python3-libtiff
+RUN pip3 install matrix-synapse
+WORKDIR /synapse
+CMD synctl start
diff --git a/matrix-synapse/Dockerfile.arm32v7 b/matrix-synapse/Dockerfile.arm32v7
new file mode 100644
index 0000000..67c45dd
--- /dev/null
+++ b/matrix-synapse/Dockerfile.arm32v7
@@ -0,0 +1,7 @@
+FROM arm32v7/debian:buster-slim
+COPY qemu-arm-static /usr/bin
+LABEL maintainer="dragonchaser <crichter@suse.de>"
+RUN apt-get update && apt-get install -y python3-pip libopenjp2-7 python3-libtiff
+RUN pip3 install matrix-synapse
+WORKDIR /synapse
+CMD synctl start
diff --git a/matrix-synapse/README.md b/matrix-synapse/README.md
new file mode 100644
index 0000000..2d41b34
--- /dev/null
+++ b/matrix-synapse/README.md
@@ -0,0 +1,7 @@
+# matrix-synapse
+
+This container runs the matrix reference server synapse (https://github.com/matrix-org/synapse).
+
+Mount data to `/synapse`.
+
+https://hub.docker.com/r/dragonchaser/matrix-synapse
diff --git a/matrix-synapse/hooks/post_checkout b/matrix-synapse/hooks/post_checkout
new file mode 100644
index 0000000..5c42267
--- /dev/null
+++ b/matrix-synapse/hooks/post_checkout
@@ -0,0 +1,2 @@
+#!/bin/bash
+curl -L https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz | tar zxvf - -C . && mv qemu-3.0.0+resin-arm/qemu-arm-static . && pwd && ls
diff --git a/matrix-synapse/hooks/pre_build b/matrix-synapse/hooks/pre_build
new file mode 100644
index 0000000..2c34175
--- /dev/null
+++ b/matrix-synapse/hooks/pre_build
@@ -0,0 +1,4 @@
+#!/bin/bash
+#register qemu-*-static for all supported processors except the 
+# current one, but also remove all registered binfmt_misc before
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
diff --git a/nginx-matrix/Dockerfile b/nginx-matrix/Dockerfile
index bb0d79a..f895947 100644
--- a/nginx-matrix/Dockerfile
+++ b/nginx-matrix/Dockerfile
@@ -1,4 +1,5 @@
 FROM nginx:latest
+LABEL maintainer="dragonchaser <crichter@suse.de>"
 EXPOSE 80
 EXPOSE 443
 EXPOSE 8448
diff --git a/nginx-matrix/Dockerfile.arm32v7 b/nginx-matrix/Dockerfile.arm32v7
index 121bdc9..9c9df57 100644
--- a/nginx-matrix/Dockerfile.arm32v7
+++ b/nginx-matrix/Dockerfile.arm32v7
@@ -1,5 +1,6 @@
 FROM arm32v7/nginx:latest
 COPY qemu-arm-static /usr/bin
+LABEL maintainer="dragonchaser <crichter@suse.de>"
 EXPOSE 80
 EXPOSE 443
 EXPOSE 8448
diff --git a/webtest/Dockerfile b/webtest/Dockerfile
index 9be756d..7191067 100644
--- a/webtest/Dockerfile
+++ b/webtest/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:latest
-MAINTAINER "dragonchaser <crichter@suse.de>"
+LABEL maintainer="dragonchaser <crichter@suse.de>"
 RUN apt-get update \
 	&& apt-get install -y ruby \
   && rm -rf /var/lib/apt/lists/* \
diff --git a/webtest/Dockerfile.arm32v7 b/webtest/Dockerfile.arm32v7
index aa2e6b9..ff7d56e 100644
--- a/webtest/Dockerfile.arm32v7
+++ b/webtest/Dockerfile.arm32v7
@@ -1,6 +1,6 @@
 FROM arm32v7/debian:buster-slim
 COPY qemu-arm-static /usr/bin
-MAINTAINER "dragonchaser <crichter@suse.de>"
+LABEL maintainer="dragonchaser <crichter@suse.de>"
 RUN apt-get update \
 	&& apt-get install -y ruby \
   && rm -rf /var/lib/apt/lists/* \
diff --git a/webtest/README.md b/webtest/README.md
index 2e733b7..7130e4a 100644
--- a/webtest/README.md
+++ b/webtest/README.md
@@ -1,8 +1,4 @@
-# dockerhub-autobuild
-
-This is a repo that holds Dockerfiles/entrypoints etc. for my dockerhub autobuilds
-
-## webtest
+# webtest
 
 A small container that serves data from `/web` using Ruby WEBrick