diff --git a/.github/workflows/pr-helm.yaml b/.github/workflows/pr-helm.yaml
index 94bed0a35c..4b98d0e1e1 100644
--- a/.github/workflows/pr-helm.yaml
+++ b/.github/workflows/pr-helm.yaml
@@ -2,7 +2,7 @@ name: pr-helm
 on:
   pull_request:
     paths:
-    - 'chart/**'
+    - 'charts/**'
     - '.github/workflows/pr-helm.yaml'
     - '.github/scripts/helm-check-expected.sh'
     - 'tools/ci/helm-values/**'
@@ -23,8 +23,8 @@ jobs:
         helm template \
           --namespace fleet \
           --release-name fleet \
-          --values chart/values.yaml \
-          chart \
+          --values charts/fleet/values.yaml \
+          charts/fleet \
         > helm-temp/output-defaults.yaml
     - name: helm template -- other configurations
       run: |
@@ -36,7 +36,7 @@ jobs:
             --namespace ${REL_NAME} \
             --release-name ${REL_NAME} \
             --values ${FILE_PATH} \
-            chart \
+            charts/fleet \
           > helm-temp/${FILE}
         done
     - name: kubeval sanity check
diff --git a/.github/workflows/release-helm.yaml b/.github/workflows/release-helm.yaml
new file mode 100644
index 0000000000..f52b4e5e96
--- /dev/null
+++ b/.github/workflows/release-helm.yaml
@@ -0,0 +1,17 @@
+name: release-helm
+on:
+  release:
+    types: [released] # don't trigger on pre-releases
+  workflow_dispatch: # allow manual trigger
+
+jobs:
+  publish-chart:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - uses: stefanprodan/helm-gh-pages@v1.4.1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        charts_dir: charts
+        target_dir: charts
+        linting: off
diff --git a/chart/Chart.yaml b/charts/fleet/Chart.yaml
similarity index 100%
rename from chart/Chart.yaml
rename to charts/fleet/Chart.yaml
diff --git a/chart/README.md b/charts/fleet/README.md
similarity index 100%
rename from chart/README.md
rename to charts/fleet/README.md
diff --git a/chart/templates/deployment.yaml b/charts/fleet/templates/deployment.yaml
similarity index 100%
rename from chart/templates/deployment.yaml
rename to charts/fleet/templates/deployment.yaml
diff --git a/chart/templates/gke-managedcertificate.yaml b/charts/fleet/templates/gke-managedcertificate.yaml
similarity index 100%
rename from chart/templates/gke-managedcertificate.yaml
rename to charts/fleet/templates/gke-managedcertificate.yaml
diff --git a/chart/templates/ingress.yaml b/charts/fleet/templates/ingress.yaml
similarity index 100%
rename from chart/templates/ingress.yaml
rename to charts/fleet/templates/ingress.yaml
diff --git a/chart/templates/rbac.yaml b/charts/fleet/templates/rbac.yaml
similarity index 100%
rename from chart/templates/rbac.yaml
rename to charts/fleet/templates/rbac.yaml
diff --git a/chart/templates/sa.yaml b/charts/fleet/templates/sa.yaml
similarity index 100%
rename from chart/templates/sa.yaml
rename to charts/fleet/templates/sa.yaml
diff --git a/chart/templates/service.yaml b/charts/fleet/templates/service.yaml
similarity index 100%
rename from chart/templates/service.yaml
rename to charts/fleet/templates/service.yaml
diff --git a/chart/values.yaml b/charts/fleet/values.yaml
similarity index 98%
rename from chart/values.yaml
rename to charts/fleet/values.yaml
index 3ce899370c..6477eeeff3 100644
--- a/chart/values.yaml
+++ b/charts/fleet/values.yaml
@@ -2,7 +2,7 @@
 # All settings related to how Fleet is deployed in Kubernetes
 hostName: fleet.localhost
 replicas: 3 # The number of Fleet instances to deploy
-imageTag: 3.6.0 # Version of Fleet to deploy
+imageTag: 3.9.0 # Version of Fleet to deploy
 createIngress: true # Whether or not to automatically create an Ingress
 ingressAnnotations: {} # Additional annotation to add to the Ingress
 podAnnotations: {} # Additional annotations to add to the Fleet pod
diff --git a/docs/3-Contribution/5-Releasing-Fleet.md b/docs/3-Contribution/5-Releasing-Fleet.md
index f9eef59495..2c5c9b0566 100644
--- a/docs/3-Contribution/5-Releasing-Fleet.md
+++ b/docs/3-Contribution/5-Releasing-Fleet.md
@@ -1,6 +1,6 @@
 # Releasing Fleet
 
-1. Update the [CHANGELOG](../../CHANGELOG.md) with the changes that have been made since the last Fleet release. Update the NPM [package.json](../../tools/fleetctl-npm/package.json) with the new version number (do not yet `npm publish`). Update the [Helm chart](../../chart/Chart.yaml) with the new version number.
+1. Update the [CHANGELOG](../../CHANGELOG.md) with the changes that have been made since the last Fleet release. Update the NPM [package.json](../../tools/fleetctl-npm/package.json) with the new version number (do not yet `npm publish`). Update the [Helm chart](../../charts/fleet/Chart.yaml) and [values file](../../charts/fleet/values.yaml) with the new version number.
 
 Commit these changes via Pull Request and pull the changes on the `master` branch locally. Check that `HEAD` of the `master` branch points to the commit with these changes.