diff --git a/charts/theia-cloud-crds/.helmignore b/charts/theia-cloud-crds/.helmignore
new file mode 100644
index 0000000..0e8a0eb
--- /dev/null
+++ b/charts/theia-cloud-crds/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/theia-cloud-crds/Chart.yaml b/charts/theia-cloud-crds/Chart.yaml
new file mode 100644
index 0000000..77f1aa4
--- /dev/null
+++ b/charts/theia-cloud-crds/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: theia-cloud-crds
+description: A Helm chart for the custom resource definitions (CRDs) of Theia Cloud
+
+# 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: 0.8.1-v001
+
+# 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.
+# It is recommended to use it with quotes.
+appVersion: "0.8.1.OSWeek23-v1"
diff --git a/charts/theia.cloud/crds/appdefinition-spec-resource.yaml b/charts/theia-cloud-crds/templates/appdefinition-spec-resource.yaml
similarity index 100%
rename from charts/theia.cloud/crds/appdefinition-spec-resource.yaml
rename to charts/theia-cloud-crds/templates/appdefinition-spec-resource.yaml
diff --git a/charts/theia.cloud/crds/session-spec-resource.yaml b/charts/theia-cloud-crds/templates/session-spec-resource.yaml
similarity index 100%
rename from charts/theia.cloud/crds/session-spec-resource.yaml
rename to charts/theia-cloud-crds/templates/session-spec-resource.yaml
diff --git a/charts/theia.cloud/crds/workspace-spec-resource.yaml b/charts/theia-cloud-crds/templates/workspace-spec-resource.yaml
similarity index 100%
rename from charts/theia.cloud/crds/workspace-spec-resource.yaml
rename to charts/theia-cloud-crds/templates/workspace-spec-resource.yaml