diff --git a/charts/dslorchestrator/templates/cluster-role.yaml b/charts/apitestrig/templates/clusterrole.yaml
similarity index 71%
rename from charts/dslorchestrator/templates/cluster-role.yaml
rename to charts/apitestrig/templates/clusterrole.yaml
index 02be436df..da268fdf5 100644
--- a/charts/dslorchestrator/templates/cluster-role.yaml
+++ b/charts/apitestrig/templates/clusterrole.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "dslorchestrator.serviceAccountName" . }}-pods-role
+  name: {{ template "apitestrig.serviceAccountName" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: [""]
diff --git a/charts/apitestrig/templates/clusterrolebinding.yaml b/charts/apitestrig/templates/clusterrolebinding.yaml
index 23914a445..12594c8d1 100644
--- a/charts/apitestrig/templates/clusterrolebinding.yaml
+++ b/charts/apitestrig/templates/clusterrolebinding.yaml
@@ -5,15 +5,15 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "apitestrig.serviceAccountName" . }}-pods-role
+  name: {{ template "apitestrig.serviceAccountName" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "apitestrig.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
\ No newline at end of file
+    namespace: {{ .Release.Namespace }}
diff --git a/charts/uitestrig/templates/cluster-role.yaml b/charts/dslorchestrator/templates/clusterrole.yaml
similarity index 70%
rename from charts/uitestrig/templates/cluster-role.yaml
rename to charts/dslorchestrator/templates/clusterrole.yaml
index 858d41695..79508f512 100644
--- a/charts/uitestrig/templates/cluster-role.yaml
+++ b/charts/dslorchestrator/templates/clusterrole.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "uitestrig.serviceAccountName" . }}-pods-role
+  name: {{ template "dslorchestrator.serviceAccountName" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: [""]
diff --git a/charts/dslorchestrator/templates/clusterrolebinding.yaml b/charts/dslorchestrator/templates/clusterrolebinding.yaml
index da072a83b..123e7f48e 100644
--- a/charts/dslorchestrator/templates/clusterrolebinding.yaml
+++ b/charts/dslorchestrator/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "dslorchestrator.serviceAccountName" . }}-pods-role
+  name: {{ template "dslorchestrator.serviceAccountName" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "dslorchestrator.serviceAccountName" . }}
diff --git a/charts/packetmanager/templates/clusterrole.yaml b/charts/packetmanager/templates/clusterrole.yaml
index d1431f771..7ae563cfd 100644
--- a/charts/packetmanager/templates/clusterrole.yaml
+++ b/charts/packetmanager/templates/clusterrole.yaml
@@ -1,7 +1,7 @@
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "common.names.fullname" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/charts/packetmanager/templates/clusterrolebinding.yaml b/charts/packetmanager/templates/clusterrolebinding.yaml
index 4852cc5ae..d2dac01f6 100644
--- a/charts/packetmanager/templates/clusterrolebinding.yaml
+++ b/charts/packetmanager/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "packetmanager.serviceAccountName" . }}
diff --git a/charts/restart-cron/templates/clusterrole.yaml b/charts/restart-cron/templates/clusterrole.yaml
index 7fb85239c..4cb21cf31 100644
--- a/charts/restart-cron/templates/clusterrole.yaml
+++ b/charts/restart-cron/templates/clusterrole.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     meta.helm.sh/release-name: restart-cron
     meta.helm.sh/release-namespace: infra-admin
-  name: pod-deleter-role
+  name: {{ .Values.role.name }}-{{ .Release.Namespace }}
 rules:
   - apiGroups:
       - apps
diff --git a/charts/restart-cron/templates/rolebinding.yaml b/charts/restart-cron/templates/clusterrolebinding.yaml
similarity index 73%
rename from charts/restart-cron/templates/rolebinding.yaml
rename to charts/restart-cron/templates/clusterrolebinding.yaml
index b0ae7097e..a30e41a3c 100644
--- a/charts/restart-cron/templates/rolebinding.yaml
+++ b/charts/restart-cron/templates/clusterrolebinding.yaml
@@ -1,12 +1,12 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ .Values.rbac.name }}
+  name: {{ .Values.rbac.name }}-{{ .Release.Namespace }}
   namespace: {{ .Values.rbac.namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Values.role.name }}
+  name: {{ .Values.role.name }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.serviceAccount.name }}
diff --git a/charts/apitestrig/templates/cluster-role.yaml b/charts/uitestrig/templates/clusterrole.yaml
similarity index 71%
rename from charts/apitestrig/templates/cluster-role.yaml
rename to charts/uitestrig/templates/clusterrole.yaml
index 5bdbc1511..9ba5e1343 100644
--- a/charts/apitestrig/templates/cluster-role.yaml
+++ b/charts/uitestrig/templates/clusterrole.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ template "apitestrig.serviceAccountName" . }}-pods-role
+  name: {{ template "uitestrig.serviceAccountName" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups: [""]
diff --git a/charts/uitestrig/templates/clusterrolebinding.yaml b/charts/uitestrig/templates/clusterrolebinding.yaml
index f43294a9c..13f43a28a 100644
--- a/charts/uitestrig/templates/clusterrolebinding.yaml
+++ b/charts/uitestrig/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "uitestrig.serviceAccountName" . }}-pods-role
+  name: {{ template "uitestrig.serviceAccountName" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "uitestrig.serviceAccountName" . }}
diff --git a/charts/websub-consolidator/templates/clusterrole.yaml b/charts/websub-consolidator/templates/clusterrole.yaml
index d1431f771..7ae563cfd 100644
--- a/charts/websub-consolidator/templates/clusterrole.yaml
+++ b/charts/websub-consolidator/templates/clusterrole.yaml
@@ -1,7 +1,7 @@
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "common.names.fullname" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/charts/websub-consolidator/templates/clusterrolebinding.yaml b/charts/websub-consolidator/templates/clusterrolebinding.yaml
index 2bbfacb33..cb8ef670f 100644
--- a/charts/websub-consolidator/templates/clusterrolebinding.yaml
+++ b/charts/websub-consolidator/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "websub-consolidator.serviceAccountName" . }}
diff --git a/charts/websub/templates/clusterrole.yaml b/charts/websub/templates/clusterrole.yaml
index d1431f771..7ae563cfd 100644
--- a/charts/websub/templates/clusterrole.yaml
+++ b/charts/websub/templates/clusterrole.yaml
@@ -1,7 +1,7 @@
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ include "common.names.fullname" . }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/charts/websub/templates/clusterrolebinding.yaml b/charts/websub/templates/clusterrolebinding.yaml
index ac095ded9..806b15314 100644
--- a/charts/websub/templates/clusterrolebinding.yaml
+++ b/charts/websub/templates/clusterrolebinding.yaml
@@ -5,14 +5,14 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "common.names.fullname" . }}
+  name: {{ template "common.names.fullname" . }}-{{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
     name: {{ template "websub.serviceAccountName" . }}