diff --git a/charts/code-server/Chart.yaml b/charts/code-server/Chart.yaml
new file mode 100644
index 000000000..ba9281ab8
--- /dev/null
+++ b/charts/code-server/Chart.yaml
@@ -0,0 +1,23 @@
+apiVersion: v2
+name: code-server
+description: A Helm chart for cdr/code-server
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 1.0.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+appVersion: 3.5.0
diff --git a/deployment/chart/README.md b/charts/code-server/README.md
similarity index 100%
rename from deployment/chart/README.md
rename to charts/code-server/README.md
diff --git a/deployment/chart/templates/NOTES.txt b/charts/code-server/templates/NOTES.txt
similarity index 100%
rename from deployment/chart/templates/NOTES.txt
rename to charts/code-server/templates/NOTES.txt
diff --git a/deployment/chart/templates/_helpers.tpl b/charts/code-server/templates/_helpers.tpl
similarity index 100%
rename from deployment/chart/templates/_helpers.tpl
rename to charts/code-server/templates/_helpers.tpl
diff --git a/deployment/chart/templates/deployment.yaml b/charts/code-server/templates/deployment.yaml
similarity index 100%
rename from deployment/chart/templates/deployment.yaml
rename to charts/code-server/templates/deployment.yaml
diff --git a/deployment/chart/templates/ingress.yaml b/charts/code-server/templates/ingress.yaml
similarity index 100%
rename from deployment/chart/templates/ingress.yaml
rename to charts/code-server/templates/ingress.yaml
diff --git a/deployment/chart/templates/pvc.yaml b/charts/code-server/templates/pvc.yaml
similarity index 100%
rename from deployment/chart/templates/pvc.yaml
rename to charts/code-server/templates/pvc.yaml
diff --git a/deployment/chart/templates/secrets.yaml b/charts/code-server/templates/secrets.yaml
similarity index 100%
rename from deployment/chart/templates/secrets.yaml
rename to charts/code-server/templates/secrets.yaml
diff --git a/deployment/chart/templates/service.yaml b/charts/code-server/templates/service.yaml
similarity index 100%
rename from deployment/chart/templates/service.yaml
rename to charts/code-server/templates/service.yaml
diff --git a/deployment/chart/templates/serviceaccount.yaml b/charts/code-server/templates/serviceaccount.yaml
similarity index 100%
rename from deployment/chart/templates/serviceaccount.yaml
rename to charts/code-server/templates/serviceaccount.yaml
diff --git a/deployment/chart/templates/tests/test-connection.yaml b/charts/code-server/templates/tests/test-connection.yaml
similarity index 100%
rename from deployment/chart/templates/tests/test-connection.yaml
rename to charts/code-server/templates/tests/test-connection.yaml
diff --git a/deployment/chart/values.yaml b/charts/code-server/values.yaml
similarity index 85%
rename from deployment/chart/values.yaml
rename to charts/code-server/values.yaml
index 102ef620f..ebbdbc167 100644
--- a/deployment/chart/values.yaml
+++ b/charts/code-server/values.yaml
@@ -2,15 +2,40 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+replicaCount: 1
+
 image:
   repository: codercom/code-server
   tag: 1.1156-vsc1.33.1
   pullPolicy: Always
 
+imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 hostnameOverride: ""
 
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
 service:
   type: NodePort
   port: 8443
diff --git a/deployment/chart/Chart.yaml b/deployment/chart/Chart.yaml
deleted file mode 100644
index 283eea6de..000000000
--- a/deployment/chart/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for code-server
-name: code-server
-version: 1.0.0