diff --git a/.github/workflows/chart-lint-test.yml b/.github/workflows/chart-lint-test.yml
index cf08464c..f797ace2 100644
--- a/.github/workflows/chart-lint-test.yml
+++ b/.github/workflows/chart-lint-test.yml
@@ -5,12 +5,12 @@ name: Chart Lint and Test
 on:
   push:
     paths:
-      - 'deploy/helm/**'
+      - 'charts/nfs-server-provisioner/**'
     branches:
       - master
   pull_request:
     paths:
-      - 'deploy/helm/**'
+      - 'charts/nfs-server-provisioner/**'
     branches:
       - master
 
diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
new file mode 100644
index 00000000..f4c5b543
--- /dev/null
+++ b/.github/workflows/helm-chart-release.yml
@@ -0,0 +1,25 @@
+name: Release Helm Charts
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        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: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.1.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/deploy/helm/.helmignore b/charts/nfs-server-provisioner/.helmignore
similarity index 100%
rename from deploy/helm/.helmignore
rename to charts/nfs-server-provisioner/.helmignore
diff --git a/deploy/helm/Chart.yaml b/charts/nfs-server-provisioner/Chart.yaml
similarity index 90%
rename from deploy/helm/Chart.yaml
rename to charts/nfs-server-provisioner/Chart.yaml
index aaa2d87e..0e2ad97e 100644
--- a/deploy/helm/Chart.yaml
+++ b/charts/nfs-server-provisioner/Chart.yaml
@@ -12,7 +12,7 @@ maintainers:
   email: joaocc-dev@live.com
 home: https://github.com/kubernetes-sigs/nfs-ganesha-server-and-external-provisioner
 sources:
-- https://github.com/kubernetes-sigs/nfs-ganesha-server-and-external-provisioner/tree/HEAD/deploy/helm
+- https://github.com/kubernetes-sigs/nfs-ganesha-server-and-external-provisioner/tree/HEAD/charts/nfs-server-provisioner
 keywords:
 - nfs
 - storage
diff --git a/deploy/helm/README.md b/charts/nfs-server-provisioner/README.md
similarity index 96%
rename from deploy/helm/README.md
rename to charts/nfs-server-provisioner/README.md
index 668550fd..eaf8d436 100644
--- a/deploy/helm/README.md
+++ b/charts/nfs-server-provisioner/README.md
@@ -29,7 +29,8 @@ package manager.
 To install the chart with the release name `my-release`:
 
 ```console
-$ helm install stable/nfs-server-provisioner --name my-release
+$ helm repo add nfs-ganesha-server-and-external-provisioner https://kubernetes-sigs.github.io/nfs-ganesha-server-and-external-provisioner/
+$ helm install my-release nfs-ganesha-server-and-external-provisioner/nfs-server-provisioner
 ```
 
 The command deploys nfs-server-provisioner on the Kubernetes cluster in the default
@@ -86,7 +87,7 @@ their default values.
 | `podSecurityContext`              | Security context settings for nfs-server-provisioner pod (see https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod)                                                        | `{}`                                                     |
 
 ```console
-$ helm install stable/nfs-server-provisioner --name my-release \
+$ helm install nfs-server-provisioner nfs-ganesha-server-and-external-provisioner/nfs-server-provisioner \
   --set=image.tag=v1.0.8,resources.limits.cpu=200m
 ```
 
@@ -94,7 +95,7 @@ Alternatively, a YAML file that specifies the values for the above parameters
 can be provided while installing the chart. For example,
 
 ```console
-$ helm install stable/nfs-server-provisioner --name my-release -f values.yaml
+$ helm install nfs-server-provisioner nfs-ganesha-server-and-external-provisioner/nfs-server-provisioner -f values.yaml
 ```
 
 > **Tip**: You can use the default [values.yaml](values.yaml) as an example
diff --git a/deploy/helm/templates/NOTES.txt b/charts/nfs-server-provisioner/templates/NOTES.txt
similarity index 100%
rename from deploy/helm/templates/NOTES.txt
rename to charts/nfs-server-provisioner/templates/NOTES.txt
diff --git a/deploy/helm/templates/_helpers.tpl b/charts/nfs-server-provisioner/templates/_helpers.tpl
similarity index 100%
rename from deploy/helm/templates/_helpers.tpl
rename to charts/nfs-server-provisioner/templates/_helpers.tpl
diff --git a/deploy/helm/templates/clusterrole.yaml b/charts/nfs-server-provisioner/templates/clusterrole.yaml
similarity index 100%
rename from deploy/helm/templates/clusterrole.yaml
rename to charts/nfs-server-provisioner/templates/clusterrole.yaml
diff --git a/deploy/helm/templates/rolebinding.yaml b/charts/nfs-server-provisioner/templates/rolebinding.yaml
similarity index 100%
rename from deploy/helm/templates/rolebinding.yaml
rename to charts/nfs-server-provisioner/templates/rolebinding.yaml
diff --git a/deploy/helm/templates/service.yaml b/charts/nfs-server-provisioner/templates/service.yaml
similarity index 100%
rename from deploy/helm/templates/service.yaml
rename to charts/nfs-server-provisioner/templates/service.yaml
diff --git a/deploy/helm/templates/serviceaccount.yaml b/charts/nfs-server-provisioner/templates/serviceaccount.yaml
similarity index 100%
rename from deploy/helm/templates/serviceaccount.yaml
rename to charts/nfs-server-provisioner/templates/serviceaccount.yaml
diff --git a/deploy/helm/templates/statefulset.yaml b/charts/nfs-server-provisioner/templates/statefulset.yaml
similarity index 100%
rename from deploy/helm/templates/statefulset.yaml
rename to charts/nfs-server-provisioner/templates/statefulset.yaml
diff --git a/deploy/helm/templates/storageclass.yaml b/charts/nfs-server-provisioner/templates/storageclass.yaml
similarity index 100%
rename from deploy/helm/templates/storageclass.yaml
rename to charts/nfs-server-provisioner/templates/storageclass.yaml
diff --git a/deploy/helm/values.yaml b/charts/nfs-server-provisioner/values.yaml
similarity index 100%
rename from deploy/helm/values.yaml
rename to charts/nfs-server-provisioner/values.yaml
diff --git a/ct.yaml b/ct.yaml
index f87b3f1b..267dea68 100644
--- a/ct.yaml
+++ b/ct.yaml
@@ -3,5 +3,5 @@
 remote: origin
 target-branch: master
 chart-dirs:
-  - deploy/helm
+  - charts/nfs-server-provisioner
 helm-extra-args: --timeout=500s