diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile
index 52473565..0edf4507 100644
--- a/debian-stretch-titan/Dockerfile
+++ b/debian-stretch-titan/Dockerfile
@@ -12,45 +12,5 @@ RUN	apt-get update && \
 		git && \
 	apt-get clean
 
-ARG	eclipsegit=https://github.com/eclipse
-ARG	eclipsegit2=git://git.eclipse.org/gitroot/titan
-
-RUN	git clone ${eclipsegit}/titan.Libraries.TCCUsefulFunctions && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.GRE && \
-	git clone ${eclipsegit}/titan.ProtocolModules.ICMP && \
-	git clone ${eclipsegit}/titan.ProtocolModules.ICMPv6 && \
-	git clone ${eclipsegit}/titan.ProtocolModules.IP && \
-	git clone ${eclipsegit}/titan.ProtocolModules.L2TP && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.M2PA && \
-	git clone ${eclipsegit}/titan.ProtocolModules.M3UA && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.SCTP && \
-	git clone ${eclipsegit}/titan.ProtocolModules.SMPP && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.SUA && \
-	git clone ${eclipsegit}/titan.ProtocolModules.TCP && \
-	git clone ${eclipsegit}/titan.ProtocolModules.UDP && \
-	git clone ${eclipsegit}/titan.ProtocolModules.RTP && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.SDP && \
-	git clone ${eclipsegit}/titan.TestPorts.Common_Components.Socket-API && \
-	git clone ${eclipsegit2}/titan.TestPorts.GPIO && \
-	git clone ${eclipsegit}/titan.TestPorts.IPL4asp && \
-	git clone ${eclipsegit}/titan.TestPorts.LANL2asp && \
-	git clone ${eclipsegit}/titan.TestPorts.PCAPasp && \
-	git clone ${eclipsegit}/titan.TestPorts.SCTPasp && \
-	git clone ${eclipsegit}/titan.TestPorts.SIPmsg && \
-	git clone ${eclipsegit}/titan.TestPorts.TCPasp && \
-	git clone ${eclipsegit}/titan.TestPorts.TELNETasp && \
-	git clone ${eclipsegit}/titan.TestPorts.UDPasp && \
-	git clone ${eclipsegit}/titan.TestPorts.UNIX_DOMAIN_SOCKETasp && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.BSSAPP_v7.3.0.git && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.BSSGP_v13.0.0.git && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.BSSMAP_v11.2.0.git && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.GTP_v13.5.0.git && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.GTPv2_v13.7.0.git && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.ISUP_Q.762.git && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.LLC_v7.1.0.git && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.MobileL3_v13.4.0.git && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.NS_v7.3.0.git && \
-	git clone ${eclipsegit2}/titan.ProtocolModules.SNDCP_v7.0.0.git
-
 # somehow Debian folks updated the gcc version but not titan :/
 RUN	sed -i 's/^#error/\/\/#error/' /usr/include/titan/cversion.h
diff --git a/ggsn-test/Dockerfile b/ggsn-test/Dockerfile
index 1aabce32..aa75316b 100644
--- a/ggsn-test/Dockerfile
+++ b/ggsn-test/Dockerfile
@@ -1,15 +1,11 @@
 FROM	laforge/debian-stretch-titan
 
-RUN	mkdir /root/projects && (cd /root/projects && ln -sf / git)
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch /tmp/commit
-RUN	cd osmo-ttcn3-hacks/ggsn_tests && \
-	git pull && \
-	./gen_links.sh && \
-	./regen_makefile.sh && \
-	make compile && \
-	make -j8
+RUN	cd osmo-ttcn3-hacks && \
+	git checkout -f -B master origin/master && \
+	make ggsn_tests
 
 VOLUME	/data
 
diff --git a/mgw-test/Dockerfile b/mgw-test/Dockerfile
index a2359a10..fa84e354 100644
--- a/mgw-test/Dockerfile
+++ b/mgw-test/Dockerfile
@@ -5,12 +5,8 @@ RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch /tmp/commit
 RUN	cd osmo-ttcn3-hacks && \
-	git pull && \
-	cd mgw && \
-	./gen_links.sh && \
-	./regen_makefile.sh && \
-	make compile && \
-	make -j8
+	git checkout -f -B master origin/master && \
+	make mgw
 
 VOLUME	/data
 
diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile
index 2b711440..7ffaa261 100644
--- a/ttcn3-nitb-sysinfo/Dockerfile
+++ b/ttcn3-nitb-sysinfo/Dockerfile
@@ -4,12 +4,9 @@ RUN	mkdir /root/projects && (cd /root/projects && ln -sf / git)
 RUN	git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
 
 ADD	http://git.osmocom.org/osmo-ttcn3-hacks/patch /tmp/commit
-RUN	cd osmo-ttcn3-hacks/sysinfo && \
-	git pull && \
-	./gen_links.sh && \
-	./regen_makefile.sh && \
-	make compile && \
-	make -j8
+RUN	cd osmo-ttcn3-hacks && \
+	git checkout -f -B master origin/master && \
+	make sysinfo
 
 VOLUME	/data