diff --git a/charts/argo-cd/crds/crd-application.yaml b/charts/argo-cd/templates/crds/crd-application.yaml
similarity index 100%
rename from charts/argo-cd/crds/crd-application.yaml
rename to charts/argo-cd/templates/crds/crd-application.yaml
diff --git a/charts/argo-cd/crds/crd-project.yaml b/charts/argo-cd/templates/crds/crd-project.yaml
similarity index 100%
rename from charts/argo-cd/crds/crd-project.yaml
rename to charts/argo-cd/templates/crds/crd-project.yaml
diff --git a/charts/argo-events/crds/eventbus-crd.yml b/charts/argo-events/templates/crds/eventbus-crd.yml
similarity index 100%
rename from charts/argo-events/crds/eventbus-crd.yml
rename to charts/argo-events/templates/crds/eventbus-crd.yml
diff --git a/charts/argo-events/crds/eventsource-crd.yml b/charts/argo-events/templates/crds/eventsource-crd.yml
similarity index 100%
rename from charts/argo-events/crds/eventsource-crd.yml
rename to charts/argo-events/templates/crds/eventsource-crd.yml
diff --git a/charts/argo-events/crds/sensor-crd.yml b/charts/argo-events/templates/crds/sensor-crd.yml
similarity index 100%
rename from charts/argo-events/crds/sensor-crd.yml
rename to charts/argo-events/templates/crds/sensor-crd.yml
diff --git a/charts/argo/crds/cluster-workflow-template-crd.yaml b/charts/argo/templates/crds/cluster-workflow-template-crd.yaml
similarity index 100%
rename from charts/argo/crds/cluster-workflow-template-crd.yaml
rename to charts/argo/templates/crds/cluster-workflow-template-crd.yaml
diff --git a/charts/argo/crds/cron-workflow-crd.yaml b/charts/argo/templates/crds/cron-workflow-crd.yaml
similarity index 100%
rename from charts/argo/crds/cron-workflow-crd.yaml
rename to charts/argo/templates/crds/cron-workflow-crd.yaml
diff --git a/charts/argo/crds/workflow-crd.yaml b/charts/argo/templates/crds/workflow-crd.yaml
similarity index 100%
rename from charts/argo/crds/workflow-crd.yaml
rename to charts/argo/templates/crds/workflow-crd.yaml
diff --git a/charts/argo/crds/workflow-eventbinding-crd.yaml b/charts/argo/templates/crds/workflow-eventbinding-crd.yaml
similarity index 100%
rename from charts/argo/crds/workflow-eventbinding-crd.yaml
rename to charts/argo/templates/crds/workflow-eventbinding-crd.yaml
diff --git a/charts/argo/crds/workflow-template-crd.yaml b/charts/argo/templates/crds/workflow-template-crd.yaml
similarity index 100%
rename from charts/argo/crds/workflow-template-crd.yaml
rename to charts/argo/templates/crds/workflow-template-crd.yaml