diff --git a/contrib/docker/release/Dockerfile b/contrib/docker/release/Dockerfile
new file mode 100644
index 00000000..e59c0532
--- /dev/null
+++ b/contrib/docker/release/Dockerfile
@@ -0,0 +1,25 @@
+FROM debian
+
+RUN apt-get update && apt-get install -y \
+    libmosquitto1 \
+    curl
+
+LABEL maintainer "ebusd@ebusd.eu"
+
+ENV EBUSD_VERSION 2.4
+ENV EBUSD_ARCH amd64
+
+LABEL version "${EBUSD_VERSION}-${EBUSD_ARCH}"
+
+RUN curl -SL https://github.com/john30/ebusd/releases/download/v${EBUSD_VERSION}/ebusd-${EBUSD_VERSION}_${EBUSD_ARCH}.deb > ebusd.deb
+
+RUN dpkg -i ebusd.deb
+
+RUN curl -SL https://github.com/john30/ebusd-configuration/archive/master.tar.gz \
+    | tar xz --strip-components=3 -C /etc/ebusd ebusd-configuration-master/ebusd-2.1.x/de
+
+EXPOSE 8888
+
+COPY docker-entrypoint.sh /
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["-f", "--scanconfig"]
diff --git a/contrib/docker/release/docker-entrypoint.sh b/contrib/docker/release/docker-entrypoint.sh
new file mode 100755
index 00000000..142a9a26
--- /dev/null
+++ b/contrib/docker/release/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+if [ "${1#-}" != "$1" ]; then
+	set -- ebusd "$@"
+fi
+
+exec "$@"
\ No newline at end of file