diff --git a/Jenkinsfile b/Jenkinsfile
index 16d7054547a3e9021efecbc14920605d6e725c3d..823c5f5df91285edc84a666767ff93169e494df6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,8 +14,7 @@ pipeline {
         //The container runtime (e.g. docker) that is used to do an image based build. If this is set then a container build is always done.
         QUARKUS_NATIVE_CONTAINER_RUNTIME = "podman"
         QUARKUS_CONTAINER_IMAGE_NAME = "user-manager"
-        QUARKUS_CONTAINER_IMAGE_ADDITIONAL_TAGS = "latest,e2e-test,snapshot-latest"
-		QUARKUS_CONTAINER_IMAGE_REGISTRY = "docker.ozg-sh.de"
+        QUARKUS_CONTAINER_IMAGE_TAG = "build-latest"
     }
 
     options {
@@ -68,18 +67,30 @@ pipeline {
 
                     QUARKUS_CONTAINER_IMAGE_TAG = "${env.BRANCH_NAME}-${version}"
                     QUARKUS_CONTAINER_IMAGE = "docker.ozg-sh.de/user-manager:${QUARKUS_CONTAINER_IMAGE_TAG}" 
-                }
-				
-				container("quarkus-22"){
-					withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
-						configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
-						    echo "Image Tag: ${QUARKUS_CONTAINER_IMAGE_TAG}"
-						    echo "Image: ${QUARKUS_CONTAINER_IMAGE}"
-							sh './mvnw -s $MAVEN_SETTINGS package -DskipTests -Pnative -Dquarkus.container-image.push=true -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dmaven.wagon.http.retryHandler.count=3'
-						}                       
-					}
-				}       
 				
+					container("quarkus-22"){
+						withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
+							configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+								sh './mvnw -s $MAVEN_SETTINGS package -DskipTests -Pnative -Dquarkus.container-image.push=false -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dquarkus.container-image.build=true -Dmaven.wagon.http.retryHandler.count=3'
+								 
+								sh 'podman login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'				
+								
+								sh "podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:${QUARKUS_CONTAINER_IMAGE_TAG}"
+	                            sh "podman push docker.ozg-sh.de/user-manager:${QUARKUS_CONTAINER_IMAGE_TAG}"
+	                            
+	                            if (env.BRANCH_NAME == 'master') {
+	                                sh 'podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:snapshot-latest'
+	                            	sh 'podman push docker.ozg-sh.de/user-manager:snapshot-latest'
+	                            }
+
+	                            if (env.BRANCH_NAME == 'release') {
+	                           	 	sh 'podman tag root/user-manager:build-latest docker.ozg-sh.de/user-manager:latest'
+	                            	sh 'podman push docker.ozg-sh.de/user-manager:latest'
+	                            }
+							} 	
+						}
+					}    
+				}  
 			}
          }