diff --git a/.gitea/workflows/buildcharts.yaml b/.gitea/workflows/buildcharts.yaml
index 33aec68..fb446c3 100644
--- a/.gitea/workflows/buildcharts.yaml
+++ b/.gitea/workflows/buildcharts.yaml
@@ -2,8 +2,7 @@ name: Package and publish helm chart
 
 on:
   push:
-    branches:
-      - main
+
 jobs:
   package-helm:
     runs-on: ubuntu-latest
@@ -27,8 +26,19 @@ jobs:
           dir_names_max_depth: '2'
           files: 'charts/**'
 
+      - name: Run helm lint on all changed charts
+        shell: bash
+        env:
+          ALL_CHANGED_CHARTS: ${{ steps.changed-files.outputs.all_changed_files }}
+        run: |
+          REPO_PATH=$(git rev-parse --show-toplevel)
+          for chart in ${ALL_CHANGED_CHARTS}; do
+            helm lint ${chart}
+          done
+
       - name: build helm package
         shell: bash
+        if: gitea.ref == 'refs/heads/main'
         env:
           PACKAGE_TOKEN: ${{ secrets.PACKAGE_TOKEN }}
           CHART_NAME: ${{ steps.chart_name.outputs.result }}