diff --git a/Jenkinsfile b/Jenkinsfile
index a181cbf5da..6a343e9476 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,11 +12,11 @@ wrappedNode(label: 'linux && x86_64') {
     are not generated when building with Jekyll. */
   sh "awk '/jekyll-redirect-from/{n=1}; n {n--; next}; 1' < _config.yml > _config.yml.tmp"
   sh "mv _config.yml.tmp _config.yml"
-  
-  sh "docker build -t docs `pwd`"
-  sh "docker build -t tests `pwd`/tests"
-  sh "docker run -v /usr/src/app/allvbuild --name docs docs /bin/true"
-  sh "docker run --rm --volumes-from docs -v `pwd`:/docs tests"
-  sh "docker rm -fv docs"
-  sh "docker rmi docs tests"
+
+  sh "docker build -t docs:${JOB_BASE_NAME}-${BUILD_NUMBER} `pwd`"
+  sh "docker build -t tests:${JOB_BASE_NAME}-${BUILD_NUMBER} `pwd`/tests"
+  sh "docker run -v /usr/src/app/allvbuild --name docs-${JOB_BASE_NAME}-${BUILD_NUMBER} docs:${JOB_BASE_NAME}-${BUILD_NUMBER} /bin/true"
+  sh "docker run --rm --volumes-from docs-${JOB_BASE_NAME}-${BUILD_NUMBER} -v `pwd`:/docs tests:${JOB_BASE_NAME}-${BUILD_NUMBER}"
+  sh "docker rm -fv docs-${JOB_BASE_NAME}-${BUILD_NUMBER}"
+  sh "docker rmi docs:${JOB_BASE_NAME}-${BUILD_NUMBER} tests:${JOB_BASE_NAME}-${BUILD_NUMBER}"
 }
\ No newline at end of file