diff --git a/osmo-upf-master/Dockerfile b/osmo-upf-master/Dockerfile
new file mode 100644
index 00000000..7c5c1e69
--- /dev/null
+++ b/osmo-upf-master/Dockerfile
@@ -0,0 +1,50 @@
+ARG	USER
+ARG	DISTRO
+FROM	$USER/$DISTRO-build
+# 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 \
+			libosmocore-dev \
+			libgtpnl-dev \
+			libnftables-dev \
+			libosmo-pfcp-dev \
+		&& apt-get clean \
+		;; \
+	centos*) \
+		dnf install -y \
+			"pkgconfig(libgtpnl)" \
+			"pkgconfig(libnftables)" \
+			"pkgconfig(libosmocore)" \
+			"pkgconfig(libosmoctrl)" \
+			"pkgconfig(libosmovty)" \
+			"pkgconfig(libosmo-pfcp)" \
+		;; \
+	esac
+
+WORKDIR	/tmp
+
+ARG	OSMO_UPF_BRANCH="master"
+
+RUN	git clone git://git.osmocom.org/osmo-upf.git
+ADD	https://gerrit.osmocom.org/plugins/gitiles/osmo-upf/+/refs/heads/$OSMO_UPF_BRANCH /tmp/commit-osmo-upf
+
+RUN	cd osmo-upf && \
+	git fetch && git checkout $OSMO_UPF_BRANCH && \
+	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_UPF_BRANCH || exit 1); \
+	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
+	autoreconf -fi && \
+	./configure && \
+	make "-j$(nproc)" install
+
+VOLUME	/data
+
+COPY	osmo-upf.cfg /data/osmo-upf.cfg
+
+WORKDIR	/data
+CMD	["/bin/sh", "-c", "/usr/local/bin/osmo-upf -c /data/osmo-upf.cfg >/data/osmo-upf.log 2>&1"]
+
+#EXPOSE
diff --git a/osmo-upf-master/Makefile b/osmo-upf-master/Makefile
new file mode 100644
index 00000000..3667084f
--- /dev/null
+++ b/osmo-upf-master/Makefile
@@ -0,0 +1,3 @@
+RUN_ARGS?=--rm --network sigtran --ip 172.18.0.23 -v upf-vol:/data
+
+include ../make/Makefile
diff --git a/osmo-upf-master/osmo-upf.cfg b/osmo-upf-master/osmo-upf.cfg
new file mode 100644
index 00000000..5ece4b8c
--- /dev/null
+++ b/osmo-upf-master/osmo-upf.cfg
@@ -0,0 +1,8 @@
+log stderr
+ logging filter all 1
+ logging color 1
+ logging print category 0
+ logging timestamp 0
+ logging level set-all notice
+gtp
+ dev create apn23