diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile
new file mode 100644
index 00000000..ed20b379
--- /dev/null
+++ b/debian-buster-erlang/Dockerfile
@@ -0,0 +1,50 @@
+FROM debian:buster
+
+MAINTAINER Harald Welte <laforge@gnumonks.org>
+
+ARG	OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_10/"
+
+# install the erlang vm and rebar (2)
+RUN	apt-get update && \
+	apt-get upgrade -y && \
+	apt-get -y install \
+		erlang \
+		rebar
+
+# add rebar3
+ADD	https://s3.amazonaws.com/rebar3/rebar3 /usr/bin/rebar3
+RUN	chmod 0755 /usr/bin/rebar3
+
+# install ninimal build utilities as well as system utilities
+RUN	apt-get update && \
+	apt-get -y install \
+		build-essential \
+		git \
+		procps \
+		tcpdump \
+		vim \
+		netcat-openbsd \
+		wget \
+		&& \
+	apt-get clean
+
+# install additional C-language / system dependencies of our Erlang projects
+RUN	apt-get update && \
+	apt-get -y install \
+		libpcap-dev \
+		&& \
+	apt-get clean
+
+# add osmocom latest repo, should we ever require packages from there
+RUN	apt-get update && apt-get install -y \
+		gnupg
+COPY	Release.key /tmp/Release.key
+RUN	apt-key add /tmp/Release.key && \
+	rm /tmp/Release.key && \
+	echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list
+ADD	$OSMOCOM_REPO/Release /tmp/Release
+
+# add a non-root user under which we will normaly execute build tests
+RUN	useradd -m osmocom
+WORKDIR	/home/osmocom
+USER	osmocom
diff --git a/debian-buster-erlang/Makefile b/debian-buster-erlang/Makefile
new file mode 100644
index 00000000..8d0e10b4
--- /dev/null
+++ b/debian-buster-erlang/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/debian-buster-erlang/Release.key b/debian-buster-erlang/Release.key
new file mode 100644
index 00000000..e6562385
--- /dev/null
+++ b/debian-buster-erlang/Release.key
@@ -0,0 +1,20 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc
+a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl
+CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4
+5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee
+S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y
+CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy
+b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc
+aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI
+ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw
+8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI
+L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb
+/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I
+ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi
+8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
+d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
+=Gvly
+-----END PGP PUBLIC KEY BLOCK-----