diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 9dcba1ec..727b9d63 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -1,7 +1,7 @@
 build-all:
-	docker build -t danceos/fail-base fail-base
+	docker build -t danceos/fail-base fail-base --build-arg CACHE_DATE="$(shell date)"
 	docker build -t danceos/fail-generic-tracing fail-generic-tracing
-	docker build -t danceos/fail-demo fail-demo
+	docker build -t danceos/fail-demo fail-demo --build-arg CACHE_DATE="$(shell date)"
 
 run-all: .compose ssh
 
diff --git a/scripts/docker/fail-base/Dockerfile b/scripts/docker/fail-base/Dockerfile
index fe2bde2b..ec107f80 100644
--- a/scripts/docker/fail-base/Dockerfile
+++ b/scripts/docker/fail-base/Dockerfile
@@ -119,10 +119,14 @@ RUN wget http://www.aspectc.org/releases/"$acversion"/ac-bin-linux-x86-64bit-"$a
 ENV PATH=/home/fail/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 # Clone FAIL*
+# Break docker layer cache
+ARG CACHE_DATE=1970-01-01
 # RUN git clone https://github.com/danceos/fail.git
 RUN git clone https://gitea.vps.chriphost.de/christoph/fail
 WORKDIR fail
 
 USER root
+
+# Accept SSH connections
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
diff --git a/scripts/docker/fail-demo/Dockerfile b/scripts/docker/fail-demo/Dockerfile
index de64ea5e..b18e12d7 100644
--- a/scripts/docker/fail-demo/Dockerfile
+++ b/scripts/docker/fail-demo/Dockerfile
@@ -16,9 +16,6 @@ WORKDIR /home/fail
 RUN echo 'export PATH=$HOME/bin:$PATH' >> ~/.profile \
  && echo 'cd $HOME/fail-targets' >> ~/.profile
 
-# RUN git clone https://github.com/danceos/fail-targets.git
-RUN git clone https://gitea.vps.chriphost.de/christoph/fail-targets
-
 WORKDIR fail
 RUN mkdir build; cd build
 WORKDIR build
@@ -135,6 +132,7 @@ RUN apt-get update \
     unzip \
  && apt-get clean
 
+# Fix old shebangs
 RUN ln -sf /usr/bin/python2 /usr/bin/python
 
 # Install python packages
@@ -143,5 +141,16 @@ RUN wget https://bootstrap.pypa.io/pip/2.7/get-pip.py \
  && wget https://raw.githubusercontent.com/paulfitz/mysql-connector-c/master/include/my_config.h -O /usr/include/mysql/my_config.h \
  && pip2 install flask pyyaml MySQL-python
 
-# For the resultbrowser, we expose port 5000 to the outside world.
+USER fail
+
+# Clone FAIL* targets
+# Break docker layer cache
+ARG CACHE_DATE=1970-01-01
+WORKDIR /home/fail
+# RUN git clone https://github.com/danceos/fail-targets.git
+RUN git clone https://gitea.vps.chriphost.de/christoph/fail-targets
+
+USER root
+
+# Resultbrowser
 EXPOSE 5000