diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7046351..8910db8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -109,14 +109,33 @@ jobs:
       - name: Run helm lint
         run: cd charts/gnocpush && helm lint .
 
-  gh-release:
-    name: Create GitHub Release
-    needs: oci_image
-    if: startsWith(github.ref, 'refs/tags/')
+
+  chart-release:
+    # only run when merged to main
+    if: github.ref == 'refs/heads/main'
+    name: Helm Chart Release
+    needs:
+      - oci_image
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+      - name: Install Helm
+        uses: azure/setup-helm@v4
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
-      - name: Release
-        uses: softprops/action-gh-release@v1
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.6.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"