diff --git a/Jenkinsfile b/Jenkinsfile
index 5dac45e24b6b0079518673a0d10f007909591dc2..33502ea4a2becf3a4903a3cef23af53fb57a515e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -261,7 +261,7 @@ String generateHelmChartVersion() {
     if (isMasterBranch()) {
         chartVersion += "-${env.GIT_COMMIT.take(7)}"
     }
-    else if (env.BRANCH_NAME != 'release') {
+    else if (!isReleaseBranch()) {
         chartVersion += "-${env.BRANCH_NAME}"
     }
 
@@ -278,7 +278,7 @@ Void tagAndPushDockerImage(String newTag){
 }
 
 String generateImageTag() {
-    def imageTag = "${env.BRANCH_NAME}-${VERSION}"
+    def imageTag = "release-2.0.1";//"${env.BRANCH_NAME}-${VERSION}"
 
     if (isMasterBranch()) {
         imageTag += "-${env.GIT_COMMIT.take(7)}"