diff --git a/Jenkinsfile b/Jenkinsfile
index 625d971c928f4a2d94542ab2fab7a47be3708cc4..5b563b117cada531eac00d4f384281001aac2bb4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -81,9 +81,16 @@ pipeline {
                          
                             openshift.tag("goofy-builder:latest", "goofy-builder:${env.BRANCH_NAME}-${version}")
 
+                            if (env.BRANCH_NAME == 'release') {
+                                openshift.tag("goofy-builder:${env.BRANCH_NAME}-${version}", "goofy-builder:latest")
+                            }
+
                             if (env.BRANCH_NAME == 'master') {
                                 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")
+
                                 dc.rollout().status()
                             }
                         }
@@ -139,6 +146,14 @@ pipeline {
                     openshift.withCluster() {
                         openshift.withProject() {
                             openshift.tag("goofy-builder:${env.BRANCH_NAME}-${version}", "sh-kiel-dev/goofy:${env.BRANCH_NAME}-${version}")
+                            
+                            if (env.BRANCH_NAME == 'master') {
+                                openshift.tag("goofy-builder:snapshot-latest", "sh-kiel-dev/goofy:snapshot-latest")
+                            }
+
+                            if (env.BRANCH_NAME == 'release') {
+                                openshift.tag("goofy-builder:latest", "sh-kiel-dev/goofy:latest")
+                            }
                         }
                         if (env.BRANCH_NAME == 'master') {
                             openshift.withProject('sh-kiel-dev') {