diff --git a/Jenkinsfile b/Jenkinsfile
index ef44d538b0f0f4cf970a4f323f586c31d43b6f5c..8b0c808cab579aa1bdbd90af6da94d512d59ab3b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -44,6 +44,7 @@ pipeline {
                 }
             }
         }
+   
         stage('Client') {
             environment {
                 FORCE_COLOR = 'false'
@@ -83,6 +84,28 @@ pipeline {
 //                }
 //            }
         }
+
+        stage('Set Version') {
+          when {
+            not {
+                anyOf {
+                    branch 'master'
+                    branch 'release'
+                }
+            }
+          }
+          steps {
+                script {
+                    FAILED_STAGE=env.STAGE_NAME
+                    JAR_TAG = getPomVersion(pomFile).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('Server') {
             steps {
                 script {
@@ -120,12 +143,6 @@ pipeline {
             }
         }
         stage('Deploy Maven Artifacts to Nexus') {
-            when {
-                anyOf {
-                    branch 'master'
-                    branch 'release'
-                }
-            }
             steps {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
@@ -133,6 +150,7 @@ pipeline {
 
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                     sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -pl -alfa-client -DskipTests deploy'
+                    sh "mvn -s $MAVEN_SETTINGS versions:revert"
                 }
             }
         }