diff --git a/docker/hub/Dockerfile b/docker/hub/Dockerfile
new file mode 100644
index 000000000..bfaf8e91e
--- /dev/null
+++ b/docker/hub/Dockerfile
@@ -0,0 +1,10 @@
+FROM docker.io/golang:1.13.7-alpine3.11 AS builder
+
+RUN apk --update --no-cache add bash build-base
+
+WORKDIR /build
+
+ADD . /build
+
+RUN mkdir -p bin
+RUN sh ./build.sh
\ No newline at end of file
diff --git a/docker/hub/Dockerfile.clientapi b/docker/hub/Dockerfile.clientapi
new file mode 100644
index 000000000..b843347bf
--- /dev/null
+++ b/docker/hub/Dockerfile.clientapi
@@ -0,0 +1,12 @@
+FROM matrixdotorg/dendrite:latest AS base
+
+FROM alpine:latest
+
+COPY --from=base /build/bin/dendrite-client-api-server /usr/bin
+COPY --from=base /build/docker/services/dendrite-client-api-server.sh /usr/bin
+
+WORKDIR /usr
+
+ENTRYPOINT ./bin/dendrite-client-api-server.sh
+
+EXPOSE 7771
\ No newline at end of file
diff --git a/docker/hub/Dockerfile.clientproxy b/docker/hub/Dockerfile.clientproxy
new file mode 100644
index 000000000..3be63dc86
--- /dev/null
+++ b/docker/hub/Dockerfile.clientproxy
@@ -0,0 +1,13 @@
+FROM matrixdotorg/dendrite:latest AS base
+
+FROM alpine:latest
+
+COPY --from=base /build/bin/client-api-proxy /usr/bin
+COPY --from=base /build/docker/services/client-api-proxy.sh /usr/bin
+
+WORKDIR /usr
+
+ENTRYPOINT ./bin/client-api-proxy.sh
+
+EXPOSE 8008
+EXPOSE 8448
\ No newline at end of file
diff --git a/docker/hub/Dockerfile.eduserver b/docker/hub/Dockerfile.eduserver
new file mode 100644
index 000000000..69dee8d34
--- /dev/null
+++ b/docker/hub/Dockerfile.eduserver
@@ -0,0 +1,12 @@
+FROM matrixdotorg/dendrite:latest AS base
+
+FROM alpine:latest
+
+COPY --from=base /build/bin/dendrite-edu-server /usr/bin
+COPY --from=base /build/docker/services/edu-server.sh /usr/bin
+
+WORKDIR /usr
+
+ENTRYPOINT ./bin/edu-server.sh
+
+EXPOSE 7777
\ No newline at end of file
diff --git a/docker/hub/Dockerfile.federationapi b/docker/hub/Dockerfile.federationapi
new file mode 100644
index 000000000..e45fc2404
--- /dev/null
+++ b/docker/hub/Dockerfile.federationapi
@@ -0,0 +1,12 @@
+FROM matrixdotorg/dendrite:latest AS base
+
+FROM alpine:latest
+
+COPY --from=base /build/bin/dendrite-federation-api /usr/bin
+COPY --from=base /build/docker/services/federation-api.sh /usr/bin
+
+WORKDIR /usr
+
+ENTRYPOINT ./bin/federation-api.sh
+
+EXPOSE 7772
\ No newline at end of file
diff --git a/docker/hub/Dockerfile.federationproxy b/docker/hub/Dockerfile.federationproxy
new file mode 100644
index 000000000..6bfadc40a
--- /dev/null
+++ b/docker/hub/Dockerfile.federationproxy
@@ -0,0 +1,13 @@
+FROM matrixdotorg/dendrite:latest AS base
+
+FROM alpine:latest
+
+COPY --from=base /build/bin/federation-api-proxy /usr/bin
+COPY --from=base /build/docker/services/federation-api-proxy.sh /usr/bin
+
+WORKDIR /usr
+
+ENTRYPOINT ./bin/federation-api-proxy.sh
+
+EXPOSE 8008
+EXPOSE 8448
\ No newline at end of file
diff --git a/docker/hub/Dockerfile.federationsender b/docker/hub/Dockerfile.federationsender
new file mode 100644
index 000000000..e41d63232
--- /dev/null
+++ b/docker/hub/Dockerfile.federationsender
@@ -0,0 +1,12 @@
+FROM matrixdotorg/dendrite:latest AS base
+
+FROM alpine:latest
+
+COPY --from=base /build/bin/dendrite-federation-sender-server /usr/bin
+COPY --from=base /build/docker/services/federation-sender.sh /usr/bin
+
+WORKDIR /usr
+
+ENTRYPOINT ./bin/federation-sender.sh
+
+EXPOSE 7776
\ No newline at end of file
diff --git a/docker/hub/Dockerfile.monolith b/docker/hub/Dockerfile.monolith
new file mode 100644
index 000000000..7afeb9195
--- /dev/null
+++ b/docker/hub/Dockerfile.monolith
@@ -0,0 +1,13 @@
+FROM matrixdotorg/dendrite:latest AS base
+
+FROM alpine:latest
+
+COPY --from=base /build/bin/dendrite-monolith-server /usr/bin
+COPY --from=base /build/docker/services/monolith.sh /usr/bin
+
+WORKDIR /usr
+
+ENTRYPOINT ./bin/monolith.sh
+
+EXPOSE 8008
+EXPOSE 8448
\ No newline at end of file