diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb9a5c7a5cef1559000db690461d6dc715f1271d..48d04ce53c463c3917da94cde8d99a6c77215c5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ verify:
 
 .get-version:
   before_script:
-    - export PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout $MAVEN_CLI_OPTS)
+    - export PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout $MAVEN_CLI_OPTS | cut -d'-' -f1)
     - export PROJECT_ARTIFACTID=$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout $MAVEN_CLI_OPTS)
     - export NEXUS_IMAGE_PREFIX="docker.ozg-sh.de/${PROJECT_ARTIFACTID}"
 
@@ -179,7 +179,7 @@ push-release-helm-nexus:
     - !reference [.get-version, before_script]
     - !reference [.helm, before_script]
   script:
-    - export HELM_CHART_VERSION=${PROJECT_VERSION}
+    - export HELM_CHART_VERSION=${CI_COMMIT_TAG}
     - !reference [.helm, script]
   rules:
     - if: $CI_COMMIT_TAG