diff --git a/Jenkinsfile b/Jenkinsfile
index ad8eddbdebe7ad4622fe0f367f4c7802c0dec157..b84fa5f53e22bafb34d7fd448aa61118db721af9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -135,9 +135,6 @@ pipeline {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
                     HELM_CHART_VERSION = buildVersionName("pom.xml")
-                    if (env.BRANCH_NAME == 'release') {
-                         HELM_CHART_VERSION = getPomVersion(pomFile)
-                    }
 
                     sh "./run_helm_test.sh"
 
@@ -273,6 +270,9 @@ void deployHelmChart(String helmChartName, String helmChartVersion) {
 }
 
 String buildVersionName(String pomFile) {
+    if (isReleaseBranch()) {
+        return getPomVersion(pomFile)
+    }
     return "${getPomVersion(pomFile)}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
 }