diff --git a/Dockerfile b/Dockerfile
index 42aaedf..2874b93 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,11 @@
-FROM docker.jcg.re/base-caddy
-RUN apk add --no-cache bash
+FROM docker.io/matrixdotorg/base-caddy
+ENV UID=1337 \
+    GID=1337
+RUN apk add --no-cache \
+      su-exec \
+      s6 \
+      bash
 ADD root /
 EXPOSE 2015 80 443
 VOLUME ["/etc/caddy", "/var/www"]
+CMD ["/bin/s6-svscan", "/etc/s6.d/"]