diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile
index 7210a56d..931ce445 100644
--- a/osmo-hnbgw-master/Dockerfile
+++ b/osmo-hnbgw-master/Dockerfile
@@ -1,4 +1,4 @@
-FROM laforge/debian-jessie-build
+FROM laforge/debian-stretch-build
 
 MAINTAINER Harald Welte <laforge@gnumonks.org>
 
@@ -6,7 +6,7 @@ COPY	Release.key /tmp/Release.key
 
 RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
-	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
+	echo "deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/ ./" > /etc/apt/sources.list.d/osmocom-nightly.list
 
 RUN	apt-get update && \
 	apt-get install -y --no-install-recommends \