diff --git a/Jenkinsfile b/Jenkinsfile
index 8749e0e15e73712632307b7e0749cf898924976f..e8139eee949f2e1a201437c870301e3c0b82fe4c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,34 +42,42 @@ pipeline {
                 }
             }
         }
-        
-        stage('Build BayernIdProxy') {
+
+        stage('Set Version') {
           steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
-                    JAR_TAG = generateImageTag('pom.xml')
+                    JAR_TAG = generateHelmChartVersion('pom.xml')
                 }
-
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                    sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true -DgenerateBackupPoms=false"
+                    
+                }
+          }
+        }   
 
-                    sh "mvn -s $MAVEN_SETTINGS -B versions:set -DnewVersion=${JAR_TAG}"
-                    //the command above does not work for bayernid-proxy-interface pom
-                    sh "mvn -s $MAVEN_SETTINGS -B versions:set -DnewVersion=${JAR_TAG} -f bayernid-proxy-interface/pom.xml"
-                    sh "mvn --no-transfer-progress -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3 -DelasticTests.disabled=true"
+        stage('Build BayernIdProxy') {
+          steps {
+                script {
+                    FAILED_STAGE=env.STAGE_NAME
+                }
+                configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                    sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3 -DelasticTests.disabled=true'
                     sh "mvn -s $MAVEN_SETTINGS versions:revert"
                 }
             }
         }
         
-        stage('Deploy to Nexus'){
+        stage('Deploy to Nexus main/release'){
             steps {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
-                    deployJarFiles()
+                }
+                configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                    sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
                 }
                
-            }
-                   
+            }       
         }
 
         stage('Build Docker image nachrichten-bayernid-proxy') {
@@ -256,12 +264,6 @@ Void tagAndPushDockerImage(String imageName, String newTag){
     }
 }
 
-Void deployJarFiles(){
-     configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
-        sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
-     }
-}
-
 String getPomVersion(String pomFile){
     def pom = readMavenPom file: pomFile