diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 018d4db..16bd031 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: ghcr.io/telekom-mms/docker-trivy-dojo-operator:latest
+          tags: ghcr.io/telekom-mms/docker-trivy-dojo-operator:latest,ghcr.io/telekom-mms/docker-trivy-dojo-operator:${{ github.event.release.tag_name }}
         if: github.ref == 'refs/heads/main'
   helm:
     runs-on: ubuntu-latest
@@ -57,10 +57,9 @@ jobs:
 
       - name: Update Chart.yaml
         run: |
-          helm release charts/
+          helm release -t ${{ github.event.release.tag_name }} --path operator.trivyDojoReportOperator.image.tag charts/
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.5.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-
diff --git a/charts/templates/_helpers.tpl b/charts/templates/_helpers.tpl
index 68f9e0e..9b148d2 100644
--- a/charts/templates/_helpers.tpl
+++ b/charts/templates/_helpers.tpl
@@ -1,5 +1,5 @@
 {{/*
-Expand the name of the chart.
+Expand the name of the chart
 */}}
 {{- define "charts.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}