diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0a7c8f38..9cc0e762 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -54,14 +54,16 @@ jobs:
           echo "VERSION=$NEW_VERSION" >> $GITHUB_OUTPUT
           echo "$CURRENT → $NEW_VERSION ($BUMP)"
 
-          # Update both package.json files
+          # Update package.json files and Helm chart
           cd server && npm version "$NEW_VERSION" --no-git-tag-version && cd ..
           cd client && npm version "$NEW_VERSION" --no-git-tag-version && cd ..
+          sed -i "s/^version: .*/version: $NEW_VERSION/" charts/trek/Chart.yaml
+          sed -i "s/^appVersion: .*/appVersion: \"$NEW_VERSION\"/" charts/trek/Chart.yaml
 
           # Commit and tag
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add server/package.json server/package-lock.json client/package.json client/package-lock.json
+          git add server/package.json server/package-lock.json client/package.json client/package-lock.json charts/trek/Chart.yaml
           git commit -m "chore: bump version to $NEW_VERSION [skip ci]"
           git tag "v$NEW_VERSION"
           git push origin main --follow-tags
@@ -151,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/README.md b/README.md
index d2749e16..27529807 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 </p>
 
 <p align="center">
-  <a href="https://discord.gg/J27gr9GH"><img src="https://img.shields.io/badge/Discord-Join%20Community-5865F2?logo=discord&logoColor=white" alt="Discord" /></a>
+  <a href="https://discord.gg/NhZBDSd4qW"><img src="https://img.shields.io/badge/Discord-Join%20Community-5865F2?logo=discord&logoColor=white" alt="Discord" /></a>
   <a href="LICENSE"><img src="https://img.shields.io/badge/License-AGPL_v3-blue.svg" alt="License: AGPL v3" /></a>
   <a href="https://hub.docker.com/r/mauriceboe/trek"><img src="https://img.shields.io/docker/pulls/mauriceboe/trek" alt="Docker Pulls" /></a>
   <a href="https://github.com/mauriceboe/TREK"><img src="https://img.shields.io/github/stars/mauriceboe/TREK" alt="GitHub Stars" /></a>
diff --git a/chart/README.md b/charts/README.md
similarity index 100%
rename from chart/README.md
rename to charts/README.md
diff --git a/chart/Chart.yaml b/charts/trek/Chart.yaml
similarity index 65%
rename from chart/Chart.yaml
rename to charts/trek/Chart.yaml
index 886ba48f..f2dcd7c0 100644
--- a/chart/Chart.yaml
+++ b/charts/trek/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 name: trek
-version: 0.1.0
+version: 2.9.12
 description: Minimal Helm chart for TREK app
-appVersion: "latest"
+appVersion: "2.9.12"
diff --git a/chart/templates/NOTES.txt b/charts/trek/templates/NOTES.txt
similarity index 100%
rename from chart/templates/NOTES.txt
rename to charts/trek/templates/NOTES.txt
diff --git a/chart/templates/_helpers.tpl b/charts/trek/templates/_helpers.tpl
similarity index 100%
rename from chart/templates/_helpers.tpl
rename to charts/trek/templates/_helpers.tpl
diff --git a/chart/templates/configmap.yaml b/charts/trek/templates/configmap.yaml
similarity index 100%
rename from chart/templates/configmap.yaml
rename to charts/trek/templates/configmap.yaml
diff --git a/chart/templates/deployment.yaml b/charts/trek/templates/deployment.yaml
similarity index 98%
rename from chart/templates/deployment.yaml
rename to charts/trek/templates/deployment.yaml
index 0ab074ba..d79ae344 100644
--- a/chart/templates/deployment.yaml
+++ b/charts/trek/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
         fsGroup: 1000
       containers:
         - name: trek
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- with .Values.resources }}
           resources:
diff --git a/chart/templates/ingress.yaml b/charts/trek/templates/ingress.yaml
similarity index 100%
rename from chart/templates/ingress.yaml
rename to charts/trek/templates/ingress.yaml
diff --git a/chart/templates/pvc.yaml b/charts/trek/templates/pvc.yaml
similarity index 100%
rename from chart/templates/pvc.yaml
rename to charts/trek/templates/pvc.yaml
diff --git a/chart/templates/secret.yaml b/charts/trek/templates/secret.yaml
similarity index 100%
rename from chart/templates/secret.yaml
rename to charts/trek/templates/secret.yaml
diff --git a/chart/templates/service.yaml b/charts/trek/templates/service.yaml
similarity index 100%
rename from chart/templates/service.yaml
rename to charts/trek/templates/service.yaml
diff --git a/chart/values.yaml b/charts/trek/values.yaml
similarity index 99%
rename from chart/values.yaml
rename to charts/trek/values.yaml
index 35758aa9..430c0d28 100644
--- a/chart/values.yaml
+++ b/charts/trek/values.yaml
@@ -1,7 +1,7 @@
 
 image:
   repository: mauriceboe/trek
-  tag: latest
+  # tag: latest
   pullPolicy: IfNotPresent
 
 # Optional image pull secrets for private registries