diff --git a/osmo-pcap-latest/Dockerfile b/osmo-pcap-latest/Dockerfile
new file mode 100644
index 00000000..30c6a56c
--- /dev/null
+++ b/osmo-pcap-latest/Dockerfile
@@ -0,0 +1,28 @@
+ARG	USER
+ARG	DISTRO
+FROM	$USER/$DISTRO-obs-latest
+# Arguments used after FROM must be specified again
+ARG	DISTRO
+
+RUN	case "$DISTRO" in \
+	debian*) \
+		apt-get update && \
+		apt-get install -y --no-install-recommends \
+			osmo-pcap-client osmo-pcap-server && \
+		apt-get clean \
+		;; \
+	centos*) \
+		dnf install -y \
+			osmo-pcap-client osmo-pcap-server \
+		;; \
+	esac
+
+WORKDIR	/data
+
+VOLUME	/data
+COPY	osmo-pcap-client.cfg /data/
+#COPY	osmo-pcap-server.cfg /data/
+
+CMD	["/bin/sh", "-c", "/usr/bin/osmo-pcap-clint -c /data/osmo-pcap-client.cfg >/data/osmo-pcap-client.log 2>&1"]
+
+EXPOSE	4237
diff --git a/osmo-pcap-latest/Makefile b/osmo-pcap-latest/Makefile
new file mode 100644
index 00000000..8d0e10b4
--- /dev/null
+++ b/osmo-pcap-latest/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/osmo-pcap-latest/osmo-pcap-client.cfg b/osmo-pcap-latest/osmo-pcap-client.cfg
new file mode 100644
index 00000000..89f1801f
--- /dev/null
+++ b/osmo-pcap-latest/osmo-pcap-client.cfg
@@ -0,0 +1,14 @@
+!
+! OsmoPCAPClient (UNKNOWN-dirty) configuration saved from vty
+!!
+!
+!
+line vty
+ no login
+!
+client
+ pcap device lo
+ pcap filter udp port 44423
+ pcap detect-loop 0
+ server ip 127.0.0.1
+ server port 5000