diff --git a/mango-jenkins/Makefile b/mango-jenkins/Makefile
index e7d8356..d8c3240 100644
--- a/mango-jenkins/Makefile
+++ b/mango-jenkins/Makefile
@@ -2,11 +2,15 @@
 git_commit ?= $(shell git log --pretty=oneline -n 1 | cut -f1 -d " ")
 name = bigdatagenomics/mango-jenkins
 tag = 0.0.1--${git_commit}
+build_tool = runtime-container.DONE
 
 # Steps
 build: Dockerfile
 	cd ../miniconda3-maven3-openjdk8 && make build
 	docker build -t ${name}:${tag} .
+	-docker rmi ${name}:latest
+	docker tag ${name}:${tag} ${name}:latest
+	touch ${build_tool}
 
 clean:
 	docker rmi -f ${name}:${tag} ${name}:${tag}
diff --git a/maven3-openjdk8-alpine/Makefile b/maven3-openjdk8-alpine/Makefile
index 64cd957..ef59991 100644
--- a/maven3-openjdk8-alpine/Makefile
+++ b/maven3-openjdk8-alpine/Makefile
@@ -2,10 +2,14 @@
 git_commit ?= $(shell git log --pretty=oneline -n 1 | cut -f1 -d " ")
 name = bigdatagenomics/maven3-openjdk8-alpine
 tag = 0.0.1--${git_commit}
+build_tool = runtime-container.DONE
 
 # Steps
 build: Dockerfile
 	docker build -t ${name}:${tag} .
+	-docker rmi ${name}:latest
+	docker tag ${name}:${tag} ${name}:latest
+	touch ${build_tool}
 
 clean:
 	docker rmi -f ${name}:${tag} ${name}:${tag}
diff --git a/maven3-openjdk8/Makefile b/maven3-openjdk8/Makefile
index cfa9489..3b6d512 100644
--- a/maven3-openjdk8/Makefile
+++ b/maven3-openjdk8/Makefile
@@ -1,11 +1,15 @@
 # Definitions
 git_commit ?= $(shell git log --pretty=oneline -n 1 | cut -f1 -d " ")
 name = bigdatagenomics/maven3-openjdk8
+build_tool = runtime-container.DONE
 tag = 0.0.1--${git_commit}
 
 # Steps
 build: Dockerfile
 	docker build -t ${name}:${tag} .
+	-docker rmi ${name}:latest
+	docker tag ${name}:${tag} ${name}:latest
+	touch ${build_tool}
 
 clean:
 	docker rmi -f ${name}:${tag} ${name}:${tag}
diff --git a/miniconda3-maven3-openjdk8/Makefile b/miniconda3-maven3-openjdk8/Makefile
index e4b8376..9d0cd1e 100644
--- a/miniconda3-maven3-openjdk8/Makefile
+++ b/miniconda3-maven3-openjdk8/Makefile
@@ -3,12 +3,15 @@ build_output = ${runtime_path}/miniconda3-maven3-openjdk8
 git_commit ?= $(shell git log --pretty=oneline -n 1 | cut -f1 -d " ")
 name = bigdatagenomics/miniconda3-maven3-openjdk8
 tag = 0.0.1--${git_commit}
-
+build_tool = runtime-container.DONE
 
 # Steps
 build: Dockerfile
 	cd ../maven3-openjdk8 && make build
 	docker build -t ${name}:${tag} .
+	-docker rmi ${name}:latest
+	docker tag ${name}:${tag} ${name}:latest
+	touch ${build_tool}
 
 clean:
 	docker rmi -f ${name}:${tag} ${name}:${tag}