diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 40af54fc..9cc0e762 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -153,3 +153,18 @@ jobs:
 
       - name: Inspect manifest
         run: docker buildx imagetools inspect mauriceboe/trek:latest
+
+  release-helm:
+    runs-on: ubuntu-latest
+    needs: version-bump
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: main
+
+      - name: Publish Helm chart
+        uses: stefanprodan/helm-gh-pages@v1.7.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          charts_dir: charts
diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
deleted file mode 100644
index d3f93c86..00000000
--- a/.github/workflows/helm-release.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Release Helm Chart
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Helm Chart Releaser
-        uses: helm/chart-releaser-action@v1.7.0
-        with:
-          config: |
-            pages_branch: gh-pages
-            charts_dir: charts