diff --git a/.github/workflows/deploy_chart.yaml b/.github/workflows/deploy_chart.yaml
index 0562a33..e82891d 100644
--- a/.github/workflows/deploy_chart.yaml
+++ b/.github/workflows/deploy_chart.yaml
@@ -21,7 +21,7 @@ jobs:
               uses: azure/setup-helm@v4.3.0
             - name: Package helm chart
               run: |
-                helm package chart/cert-manager-webhook-ionos-cloud/
+                helm package chart/cert-manager-webhook-ionos-cloud/ --app-version ${{ steps.get-latest-tag.outputs.latest-tag }}
             - name: Create Release
               uses: ncipollo/release-action@v1
               with:
@@ -38,13 +38,8 @@ jobs:
             - name: switch to helm repo branch and create/update index.yaml
               run: |
                 git checkout helm-repo
-                # if index.yaml exists and is not empty, we use merge
-                if [ -a index.yaml ] && [ -s index.yaml ]; then
-                  helm repo index . --merge index.yaml --url https://github.com/ionos-cloud/cert-manager-webhook-ionos-cloud/releases/download/chart-${{ steps.get-latest-tag.outputs.latest-tag }}/
-                else
-                  helm repo index . --url https://github.com/ionos-cloud/cert-manager-webhook-ionos-cloud/releases/download/chart-${{ steps.get-latest-tag.outputs.latest-tag }}/
-                fi
-
+                helm repo index . --merge index.yaml \
+                --url https://github.com/ionos-cloud/cert-manager-webhook-ionos-cloud/releases/download/chart-${{ steps.get-latest-tag.outputs.latest-tag }}/
                 git config user.email "no-reply@ionos-cloud.com";
                 git config user.name "IONOS-CloudBot";
                 git add index.yaml