diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 7ebbe20..2454502 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -15,15 +15,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set image tag
+      - name: Set image tag and chart version
         id: tag
         run: |
+          SHORT_SHA=$(echo ${GITHUB_SHA} | cut -c1-7)
           if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
             echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
           else
-            echo "TAG=sha-$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_ENV
+            echo "TAG=sha-${SHORT_SHA}" >> $GITHUB_ENV
           fi
           echo "IMAGE_NAME=${{ secrets.REGISTRY_URL }}/infra/infra-report" >> $GITHUB_ENV
+          echo "CHART_VERSION=0.1.0-${SHORT_SHA}" >> $GITHUB_ENV
 
       - name: Login to Harbor
         run: |
@@ -43,9 +45,10 @@ jobs:
       - name: Package Helm chart
         run: |
           sed -i "s/appVersion: .*/appVersion: \"${{ env.TAG }}\"/" charts/infra-report/Chart.yaml
-          helm package charts/infra-report --version 0.1.0 --app-version ${{ env.TAG }}
+          sed -i "s/version: .*/version: ${{ env.CHART_VERSION }}/" charts/infra-report/Chart.yaml
+          helm package charts/infra-report
 
       - name: Push Helm chart to Harbor (OCI)
         run: |
           echo '${{ secrets.REGISTRY_PASSWORD }}' | helm registry login ${{ secrets.REGISTRY_URL }} -u ${{ secrets.REGISTRY_USER }} --password-stdin
-          helm push ${CHART_NAME}-0.1.0.tgz oci://${{ secrets.REGISTRY_URL }}/infra
+          helm push ${CHART_NAME}-${{ env.CHART_VERSION }}.tgz oci://${{ secrets.REGISTRY_URL }}/infra
diff --git a/charts/infra-report/templates/deployment.yaml b/charts/infra-report/templates/deployment.yaml
index 492f793..eaa0e82 100644
--- a/charts/infra-report/templates/deployment.yaml
+++ b/charts/infra-report/templates/deployment.yaml
@@ -22,7 +22,7 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: {{ .Values.service.targetPort }}