diff --git a/helm-charts/falcon-self-hosted-registry-assessment/templates/executor-role-binding.yaml b/helm-charts/falcon-self-hosted-registry-assessment/templates/executor-role-binding.yaml
index dc5ba390..a4f47d79 100644
--- a/helm-charts/falcon-self-hosted-registry-assessment/templates/executor-role-binding.yaml
+++ b/helm-charts/falcon-self-hosted-registry-assessment/templates/executor-role-binding.yaml
@@ -1,7 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
+kind: RoleBinding
 metadata:
   name: {{ include "ra-self-hosted-executor.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
   {{- include "ra-self-hosted.labels-executor" . | nindent 4 }}
 subjects:
@@ -10,5 +11,5 @@ subjects:
     namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
+  kind: Role
   name: {{ include "ra-self-hosted-executor.fullname" . }}
diff --git a/helm-charts/falcon-self-hosted-registry-assessment/templates/executor-cluster-role.yaml b/helm-charts/falcon-self-hosted-registry-assessment/templates/executor-role.yaml
similarity index 85%
rename from helm-charts/falcon-self-hosted-registry-assessment/templates/executor-cluster-role.yaml
rename to helm-charts/falcon-self-hosted-registry-assessment/templates/executor-role.yaml
index c886c266..34294cd2 100644
--- a/helm-charts/falcon-self-hosted-registry-assessment/templates/executor-cluster-role.yaml
+++ b/helm-charts/falcon-self-hosted-registry-assessment/templates/executor-role.yaml
@@ -1,7 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
+kind: Role
 metadata:
   name: {{ include "ra-self-hosted-executor.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
   {{- include "ra-self-hosted.labels-executor" . | nindent 4 }}
 rules:
@@ -9,7 +10,6 @@ rules:
     - ""
     resources:
     - secrets
-    - namespaces
     verbs:
     - get
     - watch