diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a66dcc9e..ee281990 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,3 @@
-charts/code-server @Matthew-Beckett @alexgorbatchev 
-* @code-asher @nhooyr
\ No newline at end of file
+* @code-asher @nhooyr
+
+ci/helm-chart @Matthew-Beckett @alexgorbatchev
diff --git a/charts/code-server/.helmignore b/ci/helm-chart/.helmignore
similarity index 100%
rename from charts/code-server/.helmignore
rename to ci/helm-chart/.helmignore
diff --git a/charts/code-server/Chart.yaml b/ci/helm-chart/Chart.yaml
similarity index 100%
rename from charts/code-server/Chart.yaml
rename to ci/helm-chart/Chart.yaml
diff --git a/charts/code-server/README.md b/ci/helm-chart/README.md
similarity index 98%
rename from charts/code-server/README.md
rename to ci/helm-chart/README.md
index e0a9aa63..cb34d274 100644
--- a/charts/code-server/README.md
+++ b/ci/helm-chart/README.md
@@ -11,7 +11,7 @@ This chart is community maintained by [@Matthew-Beckett](https://github.com/Matt
 
 ```console
 $ git clone https://github.com/cdr/code-server.git
-$ helm install code-server/charts/code-server
+$ helm install code-server charts/code-server
 ```
 
 ## Introduction
diff --git a/charts/code-server/templates/NOTES.txt b/ci/helm-chart/templates/NOTES.txt
similarity index 100%
rename from charts/code-server/templates/NOTES.txt
rename to ci/helm-chart/templates/NOTES.txt
diff --git a/charts/code-server/templates/_helpers.tpl b/ci/helm-chart/templates/_helpers.tpl
similarity index 100%
rename from charts/code-server/templates/_helpers.tpl
rename to ci/helm-chart/templates/_helpers.tpl
diff --git a/charts/code-server/templates/deployment.yaml b/ci/helm-chart/templates/deployment.yaml
similarity index 100%
rename from charts/code-server/templates/deployment.yaml
rename to ci/helm-chart/templates/deployment.yaml
diff --git a/charts/code-server/templates/ingress.yaml b/ci/helm-chart/templates/ingress.yaml
similarity index 100%
rename from charts/code-server/templates/ingress.yaml
rename to ci/helm-chart/templates/ingress.yaml
diff --git a/charts/code-server/templates/pvc.yaml b/ci/helm-chart/templates/pvc.yaml
similarity index 100%
rename from charts/code-server/templates/pvc.yaml
rename to ci/helm-chart/templates/pvc.yaml
diff --git a/charts/code-server/templates/secrets.yaml b/ci/helm-chart/templates/secrets.yaml
similarity index 100%
rename from charts/code-server/templates/secrets.yaml
rename to ci/helm-chart/templates/secrets.yaml
diff --git a/charts/code-server/templates/service.yaml b/ci/helm-chart/templates/service.yaml
similarity index 100%
rename from charts/code-server/templates/service.yaml
rename to ci/helm-chart/templates/service.yaml
diff --git a/charts/code-server/templates/serviceaccount.yaml b/ci/helm-chart/templates/serviceaccount.yaml
similarity index 100%
rename from charts/code-server/templates/serviceaccount.yaml
rename to ci/helm-chart/templates/serviceaccount.yaml
diff --git a/charts/code-server/templates/tests/test-connection.yaml b/ci/helm-chart/templates/tests/test-connection.yaml
similarity index 100%
rename from charts/code-server/templates/tests/test-connection.yaml
rename to ci/helm-chart/templates/tests/test-connection.yaml
diff --git a/charts/code-server/values.yaml b/ci/helm-chart/values.yaml
similarity index 100%
rename from charts/code-server/values.yaml
rename to ci/helm-chart/values.yaml