diff --git a/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml b/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml
index 32dc9e883c6af..801ca459ca37f 100644
--- a/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml
+++ b/deploy/charts/rook-ceph/templates/clusterrolebinding.yaml
@@ -79,14 +79,14 @@ roleRef:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: cephfs-csi-nodeplugin-role
+  name: cephfs-csi-nodeplugin-role{{ if .Values.currentNamespaceOnly }}-{{ .Release.Namespace }}{{ end }}
 subjects:
   - kind: ServiceAccount
     name: rook-csi-cephfs-plugin-sa
     namespace: {{ .Release.Namespace }} # namespace:operator
 roleRef:
   kind: ClusterRole
-  name: cephfs-csi-nodeplugin
+  name: cephfs-csi-nodeplugin{{ if .Values.currentNamespaceOnly }}-{{ .Release.Namespace }}{{ end }}
   apiGroup: rbac.authorization.k8s.io
 ---
 {{- if .Values.csi.nfs.enabled }}