diff --git a/.gitignore b/.gitignore
index a26144e2c..663fad745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,7 @@ server/swagger/files/*.json
 server/swagger/swagger_gen.go
 
 docs/venv
+
+# helm charts
+.cr-index/
+.cr-release-packages/
diff --git a/.woodpecker/helm.yml b/.woodpecker/helm.yml
index 47aa8f840..761128737 100644
--- a/.woodpecker/helm.yml
+++ b/.woodpecker/helm.yml
@@ -11,7 +11,10 @@ pipeline:
       - cat charts/woodpecker-agent/Chart.yaml
       - cat charts/woodpecker-server/Chart.yaml
     when:
-      path: "charts/**"
+      path:
+        include:
+          - "charts/**"
+          - ".woodpecker/helm.yml"
 
   lint:
     image: alpine/helm:3.5.3
@@ -19,7 +22,10 @@ pipeline:
       - helm lint charts/woodpecker-agent/
       - helm lint charts/woodpecker-server/
     when:
-      path: "charts/**"
+      path:
+        include:
+          - "charts/**"
+          - ".woodpecker/helm.yml"
 
   release:
     image: quay.io/helmpack/chart-releaser:v1.2.1
@@ -27,11 +33,17 @@ pipeline:
       - source: github_token
         target: CR_TOKEN
     commands:
+      - git config --global user.email "woodpecker-bot@obermui.de"
+      - git config --global user.name "woodpecker-bot"
       - mkdir -p .cr-index
       - cr package charts/woodpecker-server
       - cr package charts/woodpecker-agent
-      - cr upload --owner woodpecker-ci --git-repo woodpecker-ci.github.io --release-name-template "helm-{{ .Name }}-{{ .Version }}"
-      - cr index --owner woodpecker-ci --git-repo woodpecker-ci.github.io --pages-branch main --charts-repo https://woodpecker-ci.org --push --release-name-template "helm-{{ .Name }}-{{ .Version }}"
+      - cr upload --token ${CR_TOKEN} --owner woodpecker-ci --git-repo woodpecker-ci.github.io --release-name-template "helm-{{ .Name }}-{{ .Version }}"
+      - git clone https://github.com/woodpecker-ci/woodpecker-ci.github.io.git
+      - cd woodpecker-ci.github.io/ && cr index --token ${CR_TOKEN} --owner woodpecker-ci --git-repo woodpecker-ci.github.io --pages-branch master --package-path ../.cr-release-packages --index-path ../.cr-index/index.yaml --charts-repo https://woodpecker-ci.org --push --release-name-template "helm-{{ .Name }}-{{ .Version }}"
     when:
       event: tag
-      path: "charts/**"
+      path:
+        include:
+          - "charts/**"
+          - ".woodpecker/helm.yml"