diff --git a/Jenkinsfile b/Jenkinsfile
index 9121be67e8146804f2cfcaba9c7f98ab78bfef54..1648770c0e560dc1421c59d6a9901c015e272b01 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,9 @@ 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_TAG = "build-latest"
+        QUARKUS_CONTAINER_IMAGE_TAG = "build-latest, snapshot-latest, latest"
+        QUARKUS_CONTAINER_IMAGE_GROUP = ""
+        QUARKUS_CONTAINER_IMAGE_REGISTRY = "docker.ozg-sh.de"
     }
 
     options {
@@ -65,27 +67,29 @@ pipeline {
 				    def pom = readMavenPom file: 'pom.xml'
 				    def version = pom.version
 
-                    QUARKUS_CONTAINER_IMAGE_TAG = "${env.BRANCH_NAME}-${version}"
-                    QUARKUS_CONTAINER_IMAGE = "docker.ozg-sh.de/user-manager:${QUARKUS_CONTAINER_IMAGE_TAG}" 
+                    QUARKUS_CONTAINER_IMAGE_TAG = "${env.BRANCH_NAME}-${version}" 
 				
 					container("quarkus-22"){
 						withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
 							configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+								sh 'podman login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'				
+								//In einem Schritt
+								//sh './mvnw -s $MAVEN_SETTINGS verify -Pnative -Dquarkus.container-image.push=true -Dmaven.wagon.http.retryHandler.count=3'
+								
+								
+								//In Seperaten Schritten
 								sh './mvnw -s $MAVEN_SETTINGS package -DskipTests -Pnative -Dquarkus.container-image.push=false -Dquarkus.container-image.build=true -Dmaven.wagon.http.retryHandler.count=3'
-								 
+								
 								sh './mvnw -s $MAVEN_SETTINGS verify -Pnative -Dquarkus.native.reuse-existing=true'
-								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 tag docker.ozg-sh.de/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'
 	                            }
 							} 	
@@ -93,7 +97,7 @@ pipeline {
 					}    
 				}  
 			}
-         }
+		}
          
 //         stage('Deploy to Nexus'){
 //            when {