diff --git a/osmo-cbc-latest/Dockerfile b/osmo-cbc-latest/Dockerfile
new file mode 100644
index 00000000..0b87b1f2
--- /dev/null
+++ b/osmo-cbc-latest/Dockerfile
@@ -0,0 +1,35 @@
+ARG	REGISTRY=docker.io
+ARG	UPSTREAM_DISTRO=debian:stretch
+FROM	${REGISTRY}/${UPSTREAM_DISTRO}
+# Arguments used after FROM must be specified again
+ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+
+MAINTAINER Harald Welte <laforge@gnumonks.org>
+
+ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
+
+COPY	Release.key /tmp/Release.key
+
+RUN	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		gnupg
+
+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
+RUN	apt-get update && \
+	apt-get install -y --no-install-recommends \
+		osmo-cbc \
+		telnet && \
+	apt-get clean
+
+WORKDIR	/data
+
+VOLUME	/data
+COPY	osmo-cbc.cfg /data/
+
+CMD	["/bin/sh", "-c", "/usr/bin/osmo-cbc -c /data/osmo-cbc.cfg >/data/osmo-cbc.log 2>&1"]
+
+EXPOSE	12345 4264 48049
diff --git a/osmo-cbc-latest/Makefile b/osmo-cbc-latest/Makefile
new file mode 100644
index 00000000..8d0e10b4
--- /dev/null
+++ b/osmo-cbc-latest/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/osmo-cbc-latest/Release.key b/osmo-cbc-latest/Release.key
new file mode 100644
index 00000000..a737316d
--- /dev/null
+++ b/osmo-cbc-latest/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
+b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCXm/4
+pgIbAwUJEEzwqgYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3f/1AH
+/A7WVSpfM4wV/DMqZPTsSjChB4JyDotxpV7qHZzBC5aaP2dINZyi9PayIwZWbvCY
+VKvt+Fw8oCGC9F9mdh10Xe+ElHeVNSihzABPuu1RkRkb1nvkymScy0yxydodYOBi
+K4WQ+BhpijXWmYvOekIwbS5Hi9BHpfgK4TinK0xsvh1bVLeQJ8YjrnNFIAR2CnBa
+X7Y72Up/kKL08DdQzuS+mKrJtAQlGMtIsukWC2ajYQMkNwm8Gvhpn8za113dCkBW
+XAFnlQqQobKwC7b19QgEtJI/YpGSrRc6WaZxPyAjscbWQlFEAB900sVj4BWT55ig
+7O2uSdsCVhTuU7T0ztwsgvmIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v
+d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4=
+=/Tek
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/osmo-cbc-latest/osmo-cbc.cfg b/osmo-cbc-latest/osmo-cbc.cfg
new file mode 100644
index 00000000..0d371c52
--- /dev/null
+++ b/osmo-cbc-latest/osmo-cbc.cfg
@@ -0,0 +1,42 @@
+!
+! OsmoCBC (0.1.0.5-e88e) configuration saved from vty
+!!
+!
+log stderr
+ logging filter all 1
+ logging color 1
+ logging print category-hex 0
+ logging print category 1
+ logging print extended-timestamp 1
+ logging print level 1
+ logging print file 1 last
+ logging level cbsp debug
+ logging level rest debug
+ logging level lglobal info
+ logging level llapd notice
+ logging level linp notice
+ logging level lmux notice
+ logging level lmi notice
+ logging level lmib notice
+ logging level lsms notice
+ logging level lctrl notice
+ logging level lgtp notice
+ logging level lstats notice
+ logging level lgsup notice
+ logging level loap notice
+ logging level lss7 notice
+ logging level lsccp notice
+ logging level lsua notice
+ logging level lm3ua notice
+ logging level lmgcp notice
+ logging level ljibuf notice
+ logging level lrspro notice
+ logging level lns notice
+ logging level lbssgp notice
+!
+line vty
+ no login
+ bind 0.0.0.0
+!
+cbc
+ unknown-peers reject