diff --git a/Makefile b/Makefile
index 0ea8abb..ec39af2 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ kustomize: ## Download kustomize locally if necessary.
 
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
-	cp config/crd/bases/kamaji.clastix.io_tenantcontrolplanes.yaml helm/kamaji/crds/tenantcontrolplane.yaml
+	cp config/crd/bases/kamaji.clastix.io_tenantcontrolplanes.yaml charts/kamaji/crds/tenantcontrolplane.yaml
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -244,5 +244,5 @@ env:
 
 .PHONY: e2e
 e2e: env load helm ginkgo ## Create a KinD cluster, install Kamaji on it and run the test suite.
-	$(HELM) upgrade --debug --install kamaji ./helm/kamaji --create-namespace --namespace kamaji-system --set "image.pullPolicy=Never"
+	$(HELM) upgrade --debug --install kamaji ./charts/kamaji --create-namespace --namespace kamaji-system --set "image.pullPolicy=Never"
 	$(GINKGO) -v ./e2e
diff --git a/helm/kamaji/.helmignore b/charts/kamaji/.helmignore
similarity index 100%
rename from helm/kamaji/.helmignore
rename to charts/kamaji/.helmignore
diff --git a/helm/kamaji/Chart.yaml b/charts/kamaji/Chart.yaml
similarity index 100%
rename from helm/kamaji/Chart.yaml
rename to charts/kamaji/Chart.yaml
diff --git a/helm/kamaji/Makefile b/charts/kamaji/Makefile
similarity index 100%
rename from helm/kamaji/Makefile
rename to charts/kamaji/Makefile
diff --git a/helm/kamaji/README.md b/charts/kamaji/README.md
similarity index 100%
rename from helm/kamaji/README.md
rename to charts/kamaji/README.md
diff --git a/helm/kamaji/README.md.gotmpl b/charts/kamaji/README.md.gotmpl
similarity index 100%
rename from helm/kamaji/README.md.gotmpl
rename to charts/kamaji/README.md.gotmpl
diff --git a/helm/kamaji/crds/tenantcontrolplane.yaml b/charts/kamaji/crds/tenantcontrolplane.yaml
similarity index 100%
rename from helm/kamaji/crds/tenantcontrolplane.yaml
rename to charts/kamaji/crds/tenantcontrolplane.yaml
diff --git a/helm/kamaji/templates/NOTES.txt b/charts/kamaji/templates/NOTES.txt
similarity index 100%
rename from helm/kamaji/templates/NOTES.txt
rename to charts/kamaji/templates/NOTES.txt
diff --git a/helm/kamaji/templates/_helpers.tpl b/charts/kamaji/templates/_helpers.tpl
similarity index 100%
rename from helm/kamaji/templates/_helpers.tpl
rename to charts/kamaji/templates/_helpers.tpl
diff --git a/helm/kamaji/templates/_helpers_etcd.tpl b/charts/kamaji/templates/_helpers_etcd.tpl
similarity index 100%
rename from helm/kamaji/templates/_helpers_etcd.tpl
rename to charts/kamaji/templates/_helpers_etcd.tpl
diff --git a/helm/kamaji/templates/controller.yaml b/charts/kamaji/templates/controller.yaml
similarity index 100%
rename from helm/kamaji/templates/controller.yaml
rename to charts/kamaji/templates/controller.yaml
diff --git a/helm/kamaji/templates/etcd_cm.yaml b/charts/kamaji/templates/etcd_cm.yaml
similarity index 100%
rename from helm/kamaji/templates/etcd_cm.yaml
rename to charts/kamaji/templates/etcd_cm.yaml
diff --git a/helm/kamaji/templates/etcd_job_postdelete.yaml b/charts/kamaji/templates/etcd_job_postdelete.yaml
similarity index 100%
rename from helm/kamaji/templates/etcd_job_postdelete.yaml
rename to charts/kamaji/templates/etcd_job_postdelete.yaml
diff --git a/helm/kamaji/templates/etcd_job_postinstall.yaml b/charts/kamaji/templates/etcd_job_postinstall.yaml
similarity index 100%
rename from helm/kamaji/templates/etcd_job_postinstall.yaml
rename to charts/kamaji/templates/etcd_job_postinstall.yaml
diff --git a/helm/kamaji/templates/etcd_rbac.yaml b/charts/kamaji/templates/etcd_rbac.yaml
similarity index 100%
rename from helm/kamaji/templates/etcd_rbac.yaml
rename to charts/kamaji/templates/etcd_rbac.yaml
diff --git a/helm/kamaji/templates/etcd_sa.yaml b/charts/kamaji/templates/etcd_sa.yaml
similarity index 100%
rename from helm/kamaji/templates/etcd_sa.yaml
rename to charts/kamaji/templates/etcd_sa.yaml
diff --git a/helm/kamaji/templates/etcd_service.yaml b/charts/kamaji/templates/etcd_service.yaml
similarity index 100%
rename from helm/kamaji/templates/etcd_service.yaml
rename to charts/kamaji/templates/etcd_service.yaml
diff --git a/helm/kamaji/templates/etcd_sts.yaml b/charts/kamaji/templates/etcd_sts.yaml
similarity index 100%
rename from helm/kamaji/templates/etcd_sts.yaml
rename to charts/kamaji/templates/etcd_sts.yaml
diff --git a/helm/kamaji/templates/rbac.yaml b/charts/kamaji/templates/rbac.yaml
similarity index 100%
rename from helm/kamaji/templates/rbac.yaml
rename to charts/kamaji/templates/rbac.yaml
diff --git a/helm/kamaji/templates/service.yaml b/charts/kamaji/templates/service.yaml
similarity index 100%
rename from helm/kamaji/templates/service.yaml
rename to charts/kamaji/templates/service.yaml
diff --git a/helm/kamaji/values.sample.yaml b/charts/kamaji/values.sample.yaml
similarity index 100%
rename from helm/kamaji/values.sample.yaml
rename to charts/kamaji/values.sample.yaml
diff --git a/helm/kamaji/values.yaml b/charts/kamaji/values.yaml
similarity index 100%
rename from helm/kamaji/values.yaml
rename to charts/kamaji/values.yaml