diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05a7bf9b5fa79647110fe4bbc592490fb4a02142..63d24af465ea1486eeae94fc07d7ee54c73b2263 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -245,6 +245,7 @@ scan-metadata-service:
       - master
   allow_failure: true
   script:
+    - "ifconfig eth0 mtu 1450 up"
     - trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-metadata-service-report.json docker.io/dbrepo/metadata-service:latest
     - trivy image --insecure --exit-code 0 docker.io/dbrepo/metadata-service:latest
     - trivy image --insecure --exit-code 1 --severity CRITICAL docker.io/dbrepo/metadata-service:latest
@@ -266,6 +267,7 @@ scan-data-service:
       - master
   allow_failure: true
   script:
+    - "ifconfig eth0 mtu 1450 up"
     - trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-data-service-report.json docker.io/dbrepo/data-service:latest
     - trivy image --insecure --exit-code 0 docker.io/dbrepo/data-service:latest
     - trivy image --insecure --exit-code 1 --severity CRITICAL docker.io/dbrepo/data-service:latest
@@ -514,10 +516,10 @@ release-helm-latest:
     - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL
   script:
     - apk add sed helm
-    - 'sed -i -e "s/^version:.*/version: \"${CHART_VERSION}-RC1\"/g" ./helm-charts/dbrepo/Chart.yaml'
-    - 'sed -i -e "s/^appVersion:.*/appVersion: \"latest\"/g" ./helm-charts/dbrepo/Chart.yaml'
+    - 'sed -i -e "s/^version:.*/version: \"${CHART_VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}\"/g" ./helm-charts/dbrepo/Chart.yaml'
+    - 'sed -i -e "s/^appVersion:.*/appVersion: \"${CHART_VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}\"/g" ./helm-charts/dbrepo/Chart.yaml'
     - helm package ./helm-charts/dbrepo --destination ./build
-    - helm push "./build/dbrepo-${CHART_VERSION}-RC1.tgz" "oci://${CI_REGISTRY2_URL}/helm"
+    - helm push "./build/dbrepo-${CHART_VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}.tgz" "oci://${CI_REGISTRY2_URL}/helm"
 
 release-helm-1.4:
   stage: release
diff --git a/Makefile b/Makefile
index 82490f7c6ef3268d60b5e6f22069a9ed304b5236..3dc5869a3cf93298b072c27529c23a7760ccbc2b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,9 +36,6 @@ build-frontend:
 build-swagger:
 	bash ./.docs/generate.sh
 
-build-helm-chart:
-	helm package ./helm-charts/dbrepo --destination ./build
-
 tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-metadata-service tag-data-service tag-search-db tag-search-db-init tag-search-service tag-data-db-sidecar
 
 tag-analyse-service:
@@ -131,10 +128,6 @@ release-storage-service-init: tag-storage-service-init
 	docker push "${REPOSITORY_1_URL}/storage-service-init:${TAG}"
 	docker push "${REPOSITORY_2_URL}/storage-service-init:${TAG}"
 
-release-helm-chart: build-helm-chart
-	helm package ./helm-charts/dbrepo --destination ./build
-	helm push ./build/dbrepo-${TAG}-dev.tgz "oci://${REPOSITORY_2_URL}/helm"
-
 test-backend: test-metadata-service test-analyse-service test-data-service
 
 test-data-service: build-data-service