diff --git a/Jenkinsfile b/Jenkinsfile
index 5b563b117cada531eac00d4f384281001aac2bb4..c09552fb3ce16fbbf4acfec0b2afe8f67afc10f4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,7 +79,7 @@ pipeline {
                                 openshift.startBuild("goofy-builder", "--from-dir=.", "--follow", "--wait")
                             }
                          
-                            openshift.tag("goofy-builder:latest", "goofy-builder:${env.BRANCH_NAME}-${version}")
+                            openshift.tag("goofy-builder:build-latest", "goofy-builder:${env.BRANCH_NAME}-${version}")
 
                             if (env.BRANCH_NAME == 'release') {
                                 openshift.tag("goofy-builder:${env.BRANCH_NAME}-${version}", "goofy-builder:latest")
@@ -89,7 +89,7 @@ pipeline {
                                 def dc = openshift.selector('dc', 'goofy-e2e')
 
                                 openshift.tag("goofy-builder:${env.BRANCH_NAME}-${version}", "goofy-builder:snapshot-latest")
-                                openshift.tag("goofy-builder:latest", "goofy-builder:e2e-latest")
+                                openshift.tag("goofy-builder:${env.BRANCH_NAME}-${version}", "goofy-builder:e2e-latest")
 
                                 dc.rollout().status()
                             }