diff --git a/Jenkinsfile b/Jenkinsfile
index 8067b2b13cf8a55649df6c6a7909d9518ea0daaf..dfcdf7586a085c3cc5b6b960320d43542f2eb337 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,8 +43,27 @@ pipeline {
                 }
             }
         }
-
-        stage('Build UserManager parent pom') {
+       stage('Set Version') {
+          when {
+            not {
+                anyOf {
+                    branch 'master'
+                    branch 'release'
+                }
+            }
+          }
+          steps {
+                script {
+                    FAILED_STAGE=env.STAGE_NAME
+                    JAR_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT")
+                }
+                configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                    sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true"
+                    
+                }
+          }
+        }   
+        stage('Build and deploy UserManager parent pom') {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
@@ -52,11 +71,12 @@ pipeline {
 
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                     sh 'mvn -N -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
+                    
                 }
             }
         }
 
-        stage('Build UserManager GRPC') {
+        stage('Build and deploy UserManager GRPC') {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
@@ -68,13 +88,14 @@ pipeline {
             }
         }
 
-        stage('Build UserManager') {
+        stage('Build and deploy UserManager') {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
 
                     configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                         sh 'mvn -pl user-manager-server -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
+                        sh "mvn -s $MAVEN_SETTINGS versions:revert"
                         junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true
                     }
                 }