diff --git a/templates/helm/templates/caches-role-binding.yaml.tpl b/templates/helm/templates/caches-role-binding.yaml.tpl
index 57b753f7..50a8d19e 100644
--- a/templates/helm/templates/caches-role-binding.yaml.tpl
+++ b/templates/helm/templates/caches-role-binding.yaml.tpl
@@ -1,11 +1,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: ack-namespaces-cache-{{ .ControllerName }}-controller
+  name: {{ IncludeTemplate "app.fullname" }}
 roleRef:
   kind: ClusterRole
   apiGroup: rbac.authorization.k8s.io
-  name: ack-namespaces-cache-{{ .ControllerName }}-controller
+  name: {{ IncludeTemplate "app.fullname" }}
 subjects:
 - kind: ServiceAccount
   name: {{ IncludeTemplate "service-account.name" }}
@@ -14,12 +14,12 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: ack-configmaps-cache-{{ .ControllerName }}-controller
+  name: {{ IncludeTemplate "app.fullname" }}
   namespace: {{ "{{ .Release.Namespace }}" }}
 roleRef:
   kind: Role
   apiGroup: rbac.authorization.k8s.io
-  name: ack-configmaps-cache-{{ .ControllerName }}-controller
+  name: {{ IncludeTemplate "app.fullname" }}
 subjects:
 - kind: ServiceAccount
   name: {{ IncludeTemplate "service-account.name" }}
diff --git a/templates/helm/templates/caches-role.yaml.tpl b/templates/helm/templates/caches-role.yaml.tpl
index 9451709b..3addf119 100644
--- a/templates/helm/templates/caches-role.yaml.tpl
+++ b/templates/helm/templates/caches-role.yaml.tpl
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: ack-namespaces-cache-{{ .ControllerName }}-controller
+  name: {{ IncludeTemplate "app.fullname" }}-clusterrole
 rules:
 - apiGroups:
   - ""
@@ -15,7 +15,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: ack-configmaps-cache-{{ .ControllerName }}-controller
+  name: {{ IncludeTemplate "app.fullname" }}-role
   namespace: {{ "{{ .Release.Namespace }}" }}
 rules:
 - apiGroups:
diff --git a/templates/helm/templates/cluster-role-binding.yaml.tpl b/templates/helm/templates/cluster-role-binding.yaml.tpl
index 78e50682..fbf2150e 100644
--- a/templates/helm/templates/cluster-role-binding.yaml.tpl
+++ b/templates/helm/templates/cluster-role-binding.yaml.tpl
@@ -2,11 +2,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ IncludeTemplate "app.fullname" }}
+  name: {{ IncludeTemplate "app.fullname" }}-rolebinding
 roleRef:
   kind: ClusterRole
   apiGroup: rbac.authorization.k8s.io
-  name: ack-{{ .ControllerName }}-controller
+  name: {{ IncludeTemplate "app.fullname" }}
 subjects:
 - kind: ServiceAccount
   name: {{ IncludeTemplate "service-account.name" }}
@@ -22,12 +22,12 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ "{{ $fullname }}" }}
+  name: {{ "{{ $fullname }}" }}-{{ "{{ . }}" }}
   namespace: {{ "{{ . }}" }}
 roleRef:
   kind: Role
   apiGroup: rbac.authorization.k8s.io
-  name: ack-{{ .ControllerName }}-controller
+  name: {{ "{{ $fullname }}" }}-{{ "{{ . }}" }}
 subjects:
 - kind: ServiceAccount
   name: {{ "{{ $serviceAccountName }}" }}
diff --git a/templates/helm/templates/cluster-role-controller.yaml.tpl b/templates/helm/templates/cluster-role-controller.yaml.tpl
index 378b284f..01461c38 100644
--- a/templates/helm/templates/cluster-role-controller.yaml.tpl
+++ b/templates/helm/templates/cluster-role-controller.yaml.tpl
@@ -1,10 +1,11 @@
 {{ "{{ $labels := .Values.role.labels }}" }}
 {{ VarIncludeTemplate "rbacRules" "rbac-rules" }}
+{{ VarIncludeTemplate "fullname" "app.fullname" }}
 {{ "{{ if eq .Values.installScope \"cluster\" }}" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: ack-{{ .ControllerName }}-controller
+  name: {{ IncludeTemplate "app.fullname" }}
   labels:
   {{ "{{- range $key, $value := $labels }}" }}
     {{ "{{ $key }}: {{ $value | quote }}" }}
@@ -18,7 +19,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: ack-{{ .ControllerName }}-controller
+  name: {{ "{{ $fullname }}" }}-{{ "{{ . }}" }}
   namespace: {{ "{{ . }}" }}
   labels:
   {{ "{{- range $key, $value := $labels }}" }}
diff --git a/templates/helm/templates/leader-election-role-binding.yaml.tpl b/templates/helm/templates/leader-election-role-binding.yaml.tpl
index 005c1820..958fd34f 100644
--- a/templates/helm/templates/leader-election-role-binding.yaml.tpl
+++ b/templates/helm/templates/leader-election-role-binding.yaml.tpl
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{.ControllerName}}-leader-election-rolebinding
+  name: {{ IncludeTemplate "app.fullname" }}-leaderelection
 {{ "{{ if .Values.leaderElection.namespace }}" }}
   namespace: {{ "{{ .Values.leaderElection.namespace }}" }}
 {{ "{{ else }}" }}
@@ -11,7 +11,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{.ControllerName}}-leader-election-role
+  name: {{ IncludeTemplate "app.fullname" }}-leaderelection
 subjects:
 - kind: ServiceAccount
   name: {{ IncludeTemplate "service-account.name" }}
diff --git a/templates/helm/templates/leader-election-role.yaml.tpl b/templates/helm/templates/leader-election-role.yaml.tpl
index a21a5277..5d0cb01a 100644
--- a/templates/helm/templates/leader-election-role.yaml.tpl
+++ b/templates/helm/templates/leader-election-role.yaml.tpl
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{.ControllerName}}-leader-election-role
+  name: {{ IncludeTemplate "app.fullname" }}-leaderelection
 {{ "{{ if .Values.leaderElection.namespace }}" }}
   namespace: {{ "{{ .Values.leaderElection.namespace }}" }}
 {{ "{{ else }}" }}
diff --git a/templates/helm/templates/role-reader.yaml.tpl b/templates/helm/templates/role-reader.yaml.tpl
index 39b369f3..8ceb9777 100644
--- a/templates/helm/templates/role-reader.yaml.tpl
+++ b/templates/helm/templates/role-reader.yaml.tpl
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: ack-{{ .ControllerName }}-reader
+  name: {{ IncludeTemplate "app.fullname" }}-reader
   namespace: {{ "{{ .Release.Namespace }}" }}
 rules:
 - apiGroups:
diff --git a/templates/helm/templates/role-writer.yaml.tpl b/templates/helm/templates/role-writer.yaml.tpl
index 6745ada7..6db6855d 100644
--- a/templates/helm/templates/role-writer.yaml.tpl
+++ b/templates/helm/templates/role-writer.yaml.tpl
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: ack-{{ .ControllerName }}-writer
+  name: {{ IncludeTemplate "app.fullname" }}-writer
   namespace: {{ "{{ .Release.Namespace }}" }}
 rules:
 - apiGroups: