diff --git a/Jenkinsfile b/Jenkinsfile
index 1707a02be0f5cc049da64d65e977f6b7a298a52a..a2645a154ceb8a30715f024389aed5f694511475 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,41 +62,45 @@ pipeline {
 				script {
 				    FAILED_STAGE=env.STAGE_NAME
 				    
-				    def pom = readMavenPom file: 'pom.xml'
-				    def version = pom.version
-
-                    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')]) {
-								//In einem Schritt
-								//sh './mvnw -s $MAVEN_SETTINGS verify -Pnative -Dquarkus.container-image.push=true -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dmaven.wagon.http.retryHandler.count=3'
-								
-								//In Seperaten Schritten
-								sh 'podman login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
 								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 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'
-	                            }
 							} 	
 						}
 					}    
 				}  
 			}
 		}
+		
+		stage('Push Docker image') {
+            steps {
+                script {
+                    FAILED_STAGE=env.STAGE_NAME
+                    def pom = readMavenPom file: 'pom.xml'
+                    def version = pom.version
+
+                    container("quarkus-22") {
+                        withCredentials([usernamePassword(credentialsId: 'jenkins-docker-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
+                            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'
+                            }
+                        }
+                    }
+                }
+            }
+        }
          
 //         stage('Deploy to Nexus'){
 //            when {