diff --git a/charts/cluster-autoscaler/templates/clusterrole.yaml b/charts/cluster-autoscaler/templates/clusterrole.yaml
index e139db6405..0b73d0fd85 100644
--- a/charts/cluster-autoscaler/templates/clusterrole.yaml
+++ b/charts/cluster-autoscaler/templates/clusterrole.yaml
@@ -42,7 +42,7 @@ rules:
     resources:
       - endpoints
     resourceNames:
-      - cluster-autoscaler
+      - {{ template "cluster-autoscaler.fullname" . }}
     verbs:
       - get
       - update
@@ -135,6 +135,7 @@ rules:
       - list
       - watch
       - get
+      - update
   - apiGroups:
     - coordination.k8s.io
     resources:
@@ -144,7 +145,7 @@ rules:
   - apiGroups:
     - coordination.k8s.io
     resourceNames:
-    - cluster-autoscaler
+    - {{ default "cluster-autoscaler" (index .Values.extraArgs "leader-elect-resource-name") }}
     resources:
     - leases
     verbs:
diff --git a/charts/cluster-autoscaler/templates/role.yaml b/charts/cluster-autoscaler/templates/role.yaml
index 8b30af626f..3bb34b8a3e 100644
--- a/charts/cluster-autoscaler/templates/role.yaml
+++ b/charts/cluster-autoscaler/templates/role.yaml
@@ -22,7 +22,7 @@ rules:
     resources:
       - configmaps
     resourceNames:
-      - cluster-autoscaler-status
+      - {{ default "cluster-autoscaler-status" (index .Values.extraArgs "status-config-map-name") }}
 {{- if (include "cluster-autoscaler.priorityExpanderEnabled" .) }}
       - cluster-autoscaler-priority-expander
 {{- end }}
@@ -77,7 +77,7 @@ rules:
   - apiGroups:
     - coordination.k8s.io
     resourceNames:
-    - cluster-autoscaler
+    - {{ default "cluster-autoscaler" (index .Values.extraArgs "leader-elect-resource-name") }}
     resources:
     - leases
     verbs: