diff --git a/Makefile.Downstream.mk b/Makefile.Downstream.mk
index 355e273d..c125e944 100644
--- a/Makefile.Downstream.mk
+++ b/Makefile.Downstream.mk
@@ -38,7 +38,16 @@ OPERATOR_SDK_VERSION ?= 1.34.1
 
 NAME_PREFIX = ocscsi-
 
-EXTRA_SERVICE_ACCOUNTS := '$(NAME_PREFIX)cephfs-ctrlplugin-sa,$(NAME_PREFIX)cephfs-nodeplugin-sa,$(NAME_PREFIX)rbd-ctrlplugin-sa,$(NAME_PREFIX)rbd-nodeplugin-sa'
+SERVICE_ACCOUNTS := \
+	$(NAME_PREFIX)cephfs-ctrlplugin-sa, \
+	$(NAME_PREFIX)cephfs-nodeplugin-sa, \
+	$(NAME_PREFIX)nfs-ctrlplugin-sa, \
+	$(NAME_PREFIX)nfs-nodeplugin-sa, \
+	$(NAME_PREFIX)rbd-ctrlplugin-sa, \
+	$(NAME_PREFIX)rbd-nodeplugin-sa
+
+# Remove spaces using tr
+EXTRA_SERVICE_ACCOUNTS := $(shell echo $(SERVICE_ACCOUNTS) | tr -d ' ')
 
 .PHONY: bundle
 bundle: kustomize operator-sdk manifests
diff --git a/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml b/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml
index 20d31041..7421cc9b 100644
--- a/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/cephcsi-operator.clusterserviceversion.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-    createdAt: "2024-08-13T11:57:45Z"
+    createdAt: "2024-08-14T06:13:44Z"
     olm.skipRange: ""
     operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/operator-type: non-standalone
@@ -341,6 +341,143 @@ spec:
           verbs:
           - create
         serviceAccountName: ocscsi-controller-manager
+      - rules:
+        - apiGroups:
+          - ""
+          resources:
+          - persistentvolumes
+          verbs:
+          - get
+          - list
+          - watch
+          - create
+          - update
+          - delete
+          - patch
+        - apiGroups:
+          - ""
+          resources:
+          - persistentvolumeclaims
+          verbs:
+          - get
+          - list
+          - watch
+          - patch
+          - update
+        - apiGroups:
+          - storage.k8s.io
+          resources:
+          - storageclasses
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - ""
+          resources:
+          - events
+          verbs:
+          - get
+          - list
+          - watch
+          - create
+          - update
+          - patch
+        - apiGroups:
+          - storage.k8s.io
+          resources:
+          - csinodes
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - ""
+          resources:
+          - nodes
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - coordination.k8s.io
+          resources:
+          - leases
+          verbs:
+          - get
+          - list
+          - watch
+          - create
+          - update
+          - patch
+        - apiGroups:
+          - ""
+          resources:
+          - secrets
+          verbs:
+          - get
+        - apiGroups:
+          - snapshot.storage.k8s.io
+          resources:
+          - volumesnapshotclasses
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - snapshot.storage.k8s.io
+          resources:
+          - volumesnapshotcontents
+          verbs:
+          - get
+          - list
+          - watch
+          - update
+          - patch
+        - apiGroups:
+          - snapshot.storage.k8s.io
+          resources:
+          - volumesnapshotcontents/status
+          verbs:
+          - update
+          - patch
+        - apiGroups:
+          - snapshot.storage.k8s.io
+          resources:
+          - volumesnapshots
+          verbs:
+          - get
+          - list
+        - apiGroups:
+          - ""
+          resources:
+          - persistentvolumeclaims/status
+          verbs:
+          - patch
+        - apiGroups:
+          - storage.k8s.io
+          resources:
+          - volumeattachments
+          verbs:
+          - get
+          - list
+          - watch
+          - patch
+        - apiGroups:
+          - storage.k8s.io
+          resources:
+          - volumeattachments/status
+          verbs:
+          - patch
+        serviceAccountName: ocscsi-nfs-ctrlplugin-sa
+      - rules:
+        - apiGroups:
+          - ""
+          resources:
+          - nodes
+          verbs:
+          - get
+        serviceAccountName: ocscsi-nfs-nodeplugin-sa
       - rules:
         - apiGroups:
           - ""