diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index be106cdb0d30..48ed1b4ca5ed 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -11,8 +11,8 @@ jobs:
         with:
           filters: |
             charts:
-              - 'charts/cluster-autoscaler/Chart.yaml'
-              - 'charts/cluster-autoscaler/*'
+              - 'charts/**/Chart.yaml'
+              - 'charts/**/*'
           token: ${{ secrets.GITHUB_TOKEN }}
   helm-lint-test:
     if: ${{ needs.changes.outputs.charts == 'true' }}
diff --git a/charts/cluster-autoscaler/.helmignore b/charts/cluster-autoscaler-chart/.helmignore
similarity index 100%
rename from charts/cluster-autoscaler/.helmignore
rename to charts/cluster-autoscaler-chart/.helmignore
diff --git a/charts/cluster-autoscaler/Chart.yaml b/charts/cluster-autoscaler-chart/Chart.yaml
similarity index 95%
rename from charts/cluster-autoscaler/Chart.yaml
rename to charts/cluster-autoscaler-chart/Chart.yaml
index 3e8af141be78..02ada00c9c65 100644
--- a/charts/cluster-autoscaler/Chart.yaml
+++ b/charts/cluster-autoscaler-chart/Chart.yaml
@@ -13,7 +13,7 @@ maintainers:
     name: gjtempleton
   - email: scott.crooks@gmail.com
     name: sc250024
-name: cluster-autoscaler
+name: cluster-autoscaler-chart
 sources:
   - https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
 type: application
diff --git a/charts/cluster-autoscaler/README.md b/charts/cluster-autoscaler-chart/README.md
similarity index 99%
rename from charts/cluster-autoscaler/README.md
rename to charts/cluster-autoscaler-chart/README.md
index 40f6c7edd51f..499e759f9753 100644
--- a/charts/cluster-autoscaler/README.md
+++ b/charts/cluster-autoscaler-chart/README.md
@@ -1,5 +1,5 @@
-cluster-autoscaler
-==================
+cluster-autoscaler-chart
+========================
 
 Scales Kubernetes worker nodes within autoscaling groups.
 
diff --git a/charts/cluster-autoscaler/README.md.gotmpl b/charts/cluster-autoscaler-chart/README.md.gotmpl
similarity index 100%
rename from charts/cluster-autoscaler/README.md.gotmpl
rename to charts/cluster-autoscaler-chart/README.md.gotmpl
diff --git a/charts/cluster-autoscaler/templates/NOTES.txt b/charts/cluster-autoscaler-chart/templates/NOTES.txt
similarity index 100%
rename from charts/cluster-autoscaler/templates/NOTES.txt
rename to charts/cluster-autoscaler-chart/templates/NOTES.txt
diff --git a/charts/cluster-autoscaler/templates/_helpers.tpl b/charts/cluster-autoscaler-chart/templates/_helpers.tpl
similarity index 100%
rename from charts/cluster-autoscaler/templates/_helpers.tpl
rename to charts/cluster-autoscaler-chart/templates/_helpers.tpl
diff --git a/charts/cluster-autoscaler/templates/clusterrole.yaml b/charts/cluster-autoscaler-chart/templates/clusterrole.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/clusterrole.yaml
rename to charts/cluster-autoscaler-chart/templates/clusterrole.yaml
diff --git a/charts/cluster-autoscaler/templates/clusterrolebinding.yaml b/charts/cluster-autoscaler-chart/templates/clusterrolebinding.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/clusterrolebinding.yaml
rename to charts/cluster-autoscaler-chart/templates/clusterrolebinding.yaml
diff --git a/charts/cluster-autoscaler/templates/deployment.yaml b/charts/cluster-autoscaler-chart/templates/deployment.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/deployment.yaml
rename to charts/cluster-autoscaler-chart/templates/deployment.yaml
diff --git a/charts/cluster-autoscaler/templates/pdb.yaml b/charts/cluster-autoscaler-chart/templates/pdb.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/pdb.yaml
rename to charts/cluster-autoscaler-chart/templates/pdb.yaml
diff --git a/charts/cluster-autoscaler/templates/podsecuritypolicy.yaml b/charts/cluster-autoscaler-chart/templates/podsecuritypolicy.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/podsecuritypolicy.yaml
rename to charts/cluster-autoscaler-chart/templates/podsecuritypolicy.yaml
diff --git a/charts/cluster-autoscaler/templates/priority-expander-configmap.yaml b/charts/cluster-autoscaler-chart/templates/priority-expander-configmap.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/priority-expander-configmap.yaml
rename to charts/cluster-autoscaler-chart/templates/priority-expander-configmap.yaml
diff --git a/charts/cluster-autoscaler/templates/role.yaml b/charts/cluster-autoscaler-chart/templates/role.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/role.yaml
rename to charts/cluster-autoscaler-chart/templates/role.yaml
diff --git a/charts/cluster-autoscaler/templates/rolebinding.yaml b/charts/cluster-autoscaler-chart/templates/rolebinding.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/rolebinding.yaml
rename to charts/cluster-autoscaler-chart/templates/rolebinding.yaml
diff --git a/charts/cluster-autoscaler/templates/secret.yaml b/charts/cluster-autoscaler-chart/templates/secret.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/secret.yaml
rename to charts/cluster-autoscaler-chart/templates/secret.yaml
diff --git a/charts/cluster-autoscaler/templates/service.yaml b/charts/cluster-autoscaler-chart/templates/service.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/service.yaml
rename to charts/cluster-autoscaler-chart/templates/service.yaml
diff --git a/charts/cluster-autoscaler/templates/serviceaccount.yaml b/charts/cluster-autoscaler-chart/templates/serviceaccount.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/serviceaccount.yaml
rename to charts/cluster-autoscaler-chart/templates/serviceaccount.yaml
diff --git a/charts/cluster-autoscaler/templates/servicemonitor.yaml b/charts/cluster-autoscaler-chart/templates/servicemonitor.yaml
similarity index 100%
rename from charts/cluster-autoscaler/templates/servicemonitor.yaml
rename to charts/cluster-autoscaler-chart/templates/servicemonitor.yaml
diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler-chart/values.yaml
similarity index 100%
rename from charts/cluster-autoscaler/values.yaml
rename to charts/cluster-autoscaler-chart/values.yaml