diff --git a/bamboo-specs/src/main/resources/scripts/build-java.sh b/bamboo-specs/src/main/resources/scripts/build-java.sh
index 21d6a29d..7b458c37 100755
--- a/bamboo-specs/src/main/resources/scripts/build-java.sh
+++ b/bamboo-specs/src/main/resources/scripts/build-java.sh
@@ -5,13 +5,13 @@ SERVICE_NAME=$1
 
 if [[ "$bamboo_planRepository_branchName" == "master" ]]
 then
-    branchVersion=$(cat pom.xml | grep -Eo "<version>.*" | sed -s 's|<version>\(.*\)\..*\(-*.*\)</version>|\1|')
-    latestVersion=$( semver $(git tag -l $branchVersion.*) | tail -n1)
+    branchVersion=$(cat pom.xml | grep -Eo "    <version>.*-SNAPSHOT</version>" | sed -s 's|<version>\(.*\)\..*\(-*.*\)</version>|\1|' | tr -d ' ')
+    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
     newVersion="$(semver $latestVersion -p -i minor)"
 elif [[ "$bamboo_planRepository_branchName" == release* ]]
 then
     branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|')
-    latestVersion=$( semver $(git tag -l $branchVersion.*) | tail -n1)
+    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
     newVersion="$(semver $latestVersion -p -i patch)"
 elif [[ "${bamboo_version_tag}" != "dev" ]]
 then
@@ -30,11 +30,13 @@ echo "gitTag=${newVersion}" > git.tag
 
 mvn --no-transfer-progress \
     -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+    ${bamboo_maven_add_param} \
     versions:set \
     -DnewVersion=${newVersion}
 
 mvn --no-transfer-progress \
     -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
+    ${bamboo_maven_add_param} \
     versions:set  \
     -DnewVersion=${newVersion}
 
@@ -56,4 +58,3 @@ mvn --no-transfer-progress \
 mvn --no-transfer-progress \
     -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
     docker:push
-