diff --git a/Makefile b/Makefile
index 1ed4b340..3b3c5589 100644
--- a/Makefile
+++ b/Makefile
@@ -206,7 +206,7 @@ build-helm-installer: manifests generate kustomize helmify ## Generate helm char
 		cp deploy/charts/ceph-csi-operator/values.yaml deploy/charts/ceph-csi-operator/values.yaml.bak; \
 	fi
 	cd build && echo "$$BUILD_INSTALLER_OVERLAY" > kustomization.yaml
-	cd build && $(KUSTOMIZE) edit add resource ../config/default/
+	cd build && $(KUSTOMIZE) edit add resource ../config/rbac ../config/manager ../config/crd
 	$(KUSTOMIZE) build build | $(HELMIFY) -preserve-ns -image-pull-secrets deploy/charts/ceph-csi-operator
 	hack/patch-csi-operator-helm-chart.sh deploy/charts/ceph-csi-operator
 	@# Restore the manually maintained values.yaml
@@ -235,7 +235,7 @@ build-csi-rbac:
 verify-helm-values: manifests generate kustomize helmify ## Verify operator values.yaml is in sync with generated output.
 	@mkdir -p build
 	@cd build && echo "$$BUILD_INSTALLER_OVERLAY" > kustomization.yaml
-	@cd build && $(KUSTOMIZE) edit add resource ../config/default/
+	@cd build && $(KUSTOMIZE) edit add resource ../config/rbac ../config/manager ../config/crd
 	@mkdir -p build/tmp-chart
 	@$(KUSTOMIZE) build build | $(HELMIFY) -preserve-ns -image-pull-secrets build/tmp-chart > /dev/null 2>&1
 	@# Compare values by stripping comments from the maintained file
diff --git a/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-cr-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-cr-rbac.yaml
deleted file mode 100644
index c587ad8e..00000000
--- a/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-cr-rbac.yaml
+++ /dev/null
@@ -1,206 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-ctrlplugin-cr
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - csinodes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - delete
-  - patch
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims
-  verbs:
-  - get
-  - list
-  - watch
-  - patch
-  - update
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - storageclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - list
-  - watch
-  - create
-  - update
-  - patch
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattachments
-  verbs:
-  - get
-  - list
-  - watch
-  - patch
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattachments/status
-  verbs:
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims/status
-  verbs:
-  - patch
-- apiGroups:
-  - snapshot.storage.k8s.io
-  resources:
-  - volumesnapshots
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - snapshot.storage.k8s.io
-  resources:
-  - volumesnapshotclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - snapshot.storage.k8s.io
-  resources:
-  - volumesnapshotcontents
-  verbs:
-  - get
-  - list
-  - watch
-  - patch
-  - update
-- apiGroups:
-  - snapshot.storage.k8s.io
-  resources:
-  - volumesnapshotcontents/status
-  verbs:
-  - update
-  - patch
-- apiGroups:
-  - groupsnapshot.storage.k8s.io
-  resources:
-  - volumegroupsnapshotclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - groupsnapshot.storage.k8s.io
-  resources:
-  - volumegroupsnapshotcontents
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-  - patch
-- apiGroups:
-  - groupsnapshot.storage.k8s.io
-  resources:
-  - volumegroupsnapshotcontents/status
-  verbs:
-  - update
-  - patch
-- apiGroups:
-  - groupsnapshot.storage.openshift.io
-  resources:
-  - volumegroupsnapshotclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - groupsnapshot.storage.openshift.io
-  resources:
-  - volumegroupsnapshotcontents
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-  - patch
-- apiGroups:
-  - groupsnapshot.storage.openshift.io
-  resources:
-  - volumegroupsnapshotcontents/status
-  verbs:
-  - update
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts/token
-  verbs:
-  - create
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattributesclasses
-  verbs:
-  - get
-  - list
-  - watch
diff --git a/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-crb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-crb-rbac.yaml
deleted file mode 100644
index 482765ee..00000000
--- a/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-crb-rbac.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-ctrlplugin-crb
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: '{{ include "ceph-csi-operator.fullname" . }}-cephfs-ctrlplugin-cr'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-cephfs-ctrlplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-r-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-r-rbac.yaml
deleted file mode 100644
index cd9f6446..00000000
--- a/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-r-rbac.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-ctrlplugin-r
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
-- apiGroups:
-  - csiaddons.openshift.io
-  resources:
-  - csiaddonsnodes
-  verbs:
-  - get
-  - watch
-  - list
-  - create
-  - update
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - replicasets
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - deployments/finalizers
-  - daemonsets/finalizers
-  verbs:
-  - update
diff --git a/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-rb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-rb-rbac.yaml
deleted file mode 100644
index 3726c60d..00000000
--- a/deploy/charts/ceph-csi-operator/templates/cephfs-ctrlplugin-rb-rbac.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-ctrlplugin-rb
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: '{{ include "ceph-csi-operator.fullname" . }}-cephfs-ctrlplugin-r'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-cephfs-ctrlplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-cr-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-cr-rbac.yaml
deleted file mode 100644
index 692f5a81..00000000
--- a/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-cr-rbac.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-nodeplugin-cr
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts/token
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - list
-  - watch
-  - create
-  - update
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  - persistentvolumeclaims
-  verbs:
-  - get
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
diff --git a/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-crb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-crb-rbac.yaml
deleted file mode 100644
index f2abb5d5..00000000
--- a/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-crb-rbac.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-nodeplugin-crb
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: '{{ include "ceph-csi-operator.fullname" . }}-cephfs-nodeplugin-cr'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-cephfs-nodeplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-r-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-r-rbac.yaml
deleted file mode 100644
index 482844fe..00000000
--- a/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-r-rbac.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-nodeplugin-r
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - csiaddons.openshift.io
-  resources:
-  - csiaddonsnodes
-  verbs:
-  - get
-  - watch
-  - list
-  - create
-  - update
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - replicasets
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - deployments/finalizers
-  - daemonsets/finalizers
-  verbs:
-  - update
diff --git a/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-rb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-rb-rbac.yaml
deleted file mode 100644
index ed91c67b..00000000
--- a/deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-rb-rbac.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-nodeplugin-rb
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: '{{ include "ceph-csi-operator.fullname" . }}-cephfs-nodeplugin-r'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-cephfs-nodeplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/nfs-ctrlplugin-cr-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nfs-ctrlplugin-cr-rbac.yaml
deleted file mode 100644
index 00619712..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nfs-ctrlplugin-cr-rbac.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nfs-ctrlplugin-cr
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-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
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattributesclasses
-  verbs:
-  - get
-  - list
-  - watch
diff --git a/deploy/charts/ceph-csi-operator/templates/nfs-ctrlplugin-crb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nfs-ctrlplugin-crb-rbac.yaml
deleted file mode 100644
index d5bec80f..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nfs-ctrlplugin-crb-rbac.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nfs-ctrlplugin-crb
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nfs-ctrlplugin-cr'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nfs-ctrlplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/nfs-nodeplugin-cr-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nfs-nodeplugin-cr-rbac.yaml
deleted file mode 100644
index d918d1b9..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nfs-nodeplugin-cr-rbac.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nfs-nodeplugin-cr
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
diff --git a/deploy/charts/ceph-csi-operator/templates/nfs-nodeplugin-crb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nfs-nodeplugin-crb-rbac.yaml
deleted file mode 100644
index d50c6f5c..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nfs-nodeplugin-crb-rbac.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nfs-nodeplugin-crb
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nfs-nodeplugin-cr'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nfs-nodeplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-cr-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-cr-rbac.yaml
deleted file mode 100644
index 1c3ad14a..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-cr-rbac.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-ctrlplugin-cr
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - delete
-  - patch
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - storageclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - list
-  - watch
-  - create
-  - update
-  - patch
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattachments
-  verbs:
-  - get
-  - list
-  - watch
-  - patch
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattachments/status
-  verbs:
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - csinodes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims/status
-  verbs:
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts/token
-  verbs:
-  - create
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - authorization.k8s.io
-  resources:
-  - subjectaccessreviews
-  verbs:
-  - create
diff --git a/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-crb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-crb-rbac.yaml
deleted file mode 100644
index 2444d20e..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-crb-rbac.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-ctrlplugin-crb
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nvmeof-ctrlplugin-cr'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nvmeof-ctrlplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-r-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-r-rbac.yaml
deleted file mode 100644
index 84ec4582..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-r-rbac.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-ctrlplugin-r
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
-- apiGroups:
-  - csiaddons.openshift.io
-  resources:
-  - csiaddonsnodes
-  verbs:
-  - get
-  - watch
-  - list
-  - create
-  - update
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - replicasets
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - deployments/finalizers
-  - daemonsets/finalizers
-  verbs:
-  - update
diff --git a/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-rb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-rb-rbac.yaml
deleted file mode 100644
index 813cbda3..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nvmeof-ctrlplugin-rb-rbac.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-ctrlplugin-rb
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nvmeof-ctrlplugin-r'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nvmeof-ctrlplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-cr-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-cr-rbac.yaml
deleted file mode 100644
index 2a1a90b5..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-cr-rbac.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-nodeplugin-cr
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattachments
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts/token
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - list
-  - watch
-  - create
-  - update
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims
-  verbs:
-  - get
diff --git a/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-crb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-crb-rbac.yaml
deleted file mode 100644
index 30b98590..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-crb-rbac.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-nodeplugin-crb
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nvmeof-nodeplugin-cr'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nvmeof-nodeplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-r-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-r-rbac.yaml
deleted file mode 100644
index 45b4bc23..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-r-rbac.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-nodeplugin-r
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - csiaddons.openshift.io
-  resources:
-  - csiaddonsnodes
-  verbs:
-  - get
-  - watch
-  - list
-  - create
-  - update
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - replicasets
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - deployments/finalizers
-  - daemonsets/finalizers
-  verbs:
-  - update
diff --git a/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-rb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-rb-rbac.yaml
deleted file mode 100644
index 374a8006..00000000
--- a/deploy/charts/ceph-csi-operator/templates/nvmeof-nodeplugin-rb-rbac.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-nodeplugin-rb
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nvmeof-nodeplugin-r'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-nvmeof-nodeplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-cr-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-cr-rbac.yaml
deleted file mode 100644
index 5bb9e790..00000000
--- a/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-cr-rbac.yaml
+++ /dev/null
@@ -1,235 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-ctrlplugin-cr
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - delete
-  - patch
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - storageclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - list
-  - watch
-  - create
-  - update
-  - patch
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattachments
-  verbs:
-  - get
-  - list
-  - watch
-  - patch
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattachments/status
-  verbs:
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - csinodes
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims/status
-  verbs:
-  - patch
-- apiGroups:
-  - snapshot.storage.k8s.io
-  resources:
-  - volumesnapshots
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - snapshot.storage.k8s.io
-  resources:
-  - volumesnapshotclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - snapshot.storage.k8s.io
-  resources:
-  - volumesnapshotcontents
-  verbs:
-  - get
-  - list
-  - watch
-  - patch
-  - update
-- apiGroups:
-  - snapshot.storage.k8s.io
-  resources:
-  - volumesnapshotcontents/status
-  verbs:
-  - update
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts/token
-  verbs:
-  - create
-- apiGroups:
-  - groupsnapshot.storage.k8s.io
-  resources:
-  - volumegroupsnapshotclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - groupsnapshot.storage.k8s.io
-  resources:
-  - volumegroupsnapshotcontents
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-  - patch
-- apiGroups:
-  - groupsnapshot.storage.k8s.io
-  resources:
-  - volumegroupsnapshotcontents/status
-  verbs:
-  - update
-  - patch
-- apiGroups:
-  - groupsnapshot.storage.openshift.io
-  resources:
-  - volumegroupsnapshotclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - groupsnapshot.storage.openshift.io
-  resources:
-  - volumegroupsnapshotcontents
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-  - patch
-- apiGroups:
-  - groupsnapshot.storage.openshift.io
-  resources:
-  - volumegroupsnapshotcontents/status
-  verbs:
-  - update
-  - patch
-- apiGroups:
-  - replication.storage.openshift.io
-  resources:
-  - volumegroupreplicationcontents
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - replication.storage.openshift.io
-  resources:
-  - volumegroupreplicationclasses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - authorization.k8s.io
-  resources:
-  - subjectaccessreviews
-  verbs:
-  - create
-- apiGroups:
-  - cbt.storage.k8s.io
-  resources:
-  - snapshotmetadataservices
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattributesclasses
-  verbs:
-  - get
-  - list
-  - watch
diff --git a/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-crb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-crb-rbac.yaml
deleted file mode 100644
index 707249de..00000000
--- a/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-crb-rbac.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-ctrlplugin-crb
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: '{{ include "ceph-csi-operator.fullname" . }}-rbd-ctrlplugin-cr'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-rbd-ctrlplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-r-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-r-rbac.yaml
deleted file mode 100644
index 305a0655..00000000
--- a/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-r-rbac.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-ctrlplugin-r
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - get
-  - watch
-  - list
-  - delete
-  - update
-  - create
-- apiGroups:
-  - csiaddons.openshift.io
-  resources:
-  - csiaddonsnodes
-  verbs:
-  - get
-  - watch
-  - list
-  - create
-  - update
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - replicasets
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - deployments/finalizers
-  - daemonsets/finalizers
-  verbs:
-  - update
diff --git a/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-rb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-rb-rbac.yaml
deleted file mode 100644
index 77095bc1..00000000
--- a/deploy/charts/ceph-csi-operator/templates/rbd-ctrlplugin-rb-rbac.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-ctrlplugin-rb
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: '{{ include "ceph-csi-operator.fullname" . }}-rbd-ctrlplugin-r'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-rbd-ctrlplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-cr-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-cr-rbac.yaml
deleted file mode 100644
index 8fe2c400..00000000
--- a/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-cr-rbac.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-nodeplugin-cr
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - storage.k8s.io
-  resources:
-  - volumeattachments
-  verbs:
-  - get
-  - list
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts/token
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - nodes
-  verbs:
-  - get
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - list
-  - watch
-  - create
-  - update
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims
-  verbs:
-  - get
diff --git a/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-crb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-crb-rbac.yaml
deleted file mode 100644
index b9b51c4d..00000000
--- a/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-crb-rbac.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-nodeplugin-crb
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: '{{ include "ceph-csi-operator.fullname" . }}-rbd-nodeplugin-cr'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-rbd-nodeplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-r-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-r-rbac.yaml
deleted file mode 100644
index c2a64521..00000000
--- a/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-r-rbac.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-nodeplugin-r
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-rules:
-- apiGroups:
-  - csiaddons.openshift.io
-  resources:
-  - csiaddonsnodes
-  verbs:
-  - get
-  - watch
-  - list
-  - create
-  - update
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - replicasets
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - deployments/finalizers
-  - daemonsets/finalizers
-  verbs:
-  - update
diff --git a/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-rb-rbac.yaml b/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-rb-rbac.yaml
deleted file mode 100644
index d711dee7..00000000
--- a/deploy/charts/ceph-csi-operator/templates/rbd-nodeplugin-rb-rbac.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- $root := . -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-nodeplugin-rb
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: '{{ include "ceph-csi-operator.fullname" . }}-rbd-nodeplugin-r'
-subjects:
-- kind: ServiceAccount
-  name: '{{ include "ceph-csi-operator.fullname" . }}-rbd-nodeplugin-sa'
-  namespace: '{{ .Release.Namespace }}'
diff --git a/deploy/charts/ceph-csi-operator/templates/serviceaccount.yaml b/deploy/charts/ceph-csi-operator/templates/serviceaccount.yaml
index 33a655c5..c96fcfd3 100644
--- a/deploy/charts/ceph-csi-operator/templates/serviceaccount.yaml
+++ b/deploy/charts/ceph-csi-operator/templates/serviceaccount.yaml
@@ -1,34 +1,6 @@
 {{- $root := . -}}
 apiVersion: v1
 kind: ServiceAccount
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-ctrlplugin-sa
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-  annotations:
-    {{- toYaml .Values.cephfsCtrlpluginSa.serviceAccount.annotations | nindent 4 }}
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml . | indent 2 }}
-{{- end }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-cephfs-nodeplugin-sa
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-  annotations:
-    {{- toYaml .Values.cephfsNodepluginSa.serviceAccount.annotations | nindent 4 }}
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml . | indent 2 }}
-{{- end }}
----
-apiVersion: v1
-kind: ServiceAccount
 metadata:
   name: {{ include "ceph-csi-operator.fullname" . }}-controller-manager
   namespace: {{ $root.Release.Namespace }}
@@ -40,87 +12,3 @@ metadata:
 imagePullSecrets:
 {{ toYaml . | indent 2 }}
 {{- end }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nfs-ctrlplugin-sa
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-  annotations:
-    {{- toYaml .Values.nfsCtrlpluginSa.serviceAccount.annotations | nindent 4 }}
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml . | indent 2 }}
-{{- end }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nfs-nodeplugin-sa
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-  annotations:
-    {{- toYaml .Values.nfsNodepluginSa.serviceAccount.annotations | nindent 4 }}
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml . | indent 2 }}
-{{- end }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-ctrlplugin-sa
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-  annotations:
-    {{- toYaml .Values.nvmeofCtrlpluginSa.serviceAccount.annotations | nindent 4 }}
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml . | indent 2 }}
-{{- end }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-nvmeof-nodeplugin-sa
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-  annotations:
-    {{- toYaml .Values.nvmeofNodepluginSa.serviceAccount.annotations | nindent 4 }}
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml . | indent 2 }}
-{{- end }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-ctrlplugin-sa
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-  annotations:
-    {{- toYaml .Values.rbdCtrlpluginSa.serviceAccount.annotations | nindent 4 }}
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml . | indent 2 }}
-{{- end }}
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "ceph-csi-operator.fullname" . }}-rbd-nodeplugin-sa
-  namespace: {{ $root.Release.Namespace }}
-  labels:
-  {{- include "ceph-csi-operator.labels" . | nindent 4 }}
-  annotations:
-    {{- toYaml .Values.rbdNodepluginSa.serviceAccount.annotations | nindent 4 }}
-{{- with .Values.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml . | indent 2 }}
-{{- end }}
diff --git a/deploy/charts/ceph-csi-operator/values.yaml b/deploy/charts/ceph-csi-operator/values.yaml
index 959bcfaf..1bf79b9b 100644
--- a/deploy/charts/ceph-csi-operator/values.yaml
+++ b/deploy/charts/ceph-csi-operator/values.yaml
@@ -1,13 +1,3 @@
-# Service account configuration for CephFS controller plugin
-cephfsCtrlpluginSa:
-  serviceAccount:
-    # -- Annotations to add to the CephFS controller plugin service account (default: {})
-    annotations: {}
-# Service account configuration for CephFS node plugin
-cephfsNodepluginSa:
-  serviceAccount:
-    # -- Annotations to add to the CephFS node plugin service account (default: {})
-    annotations: {}
 # Controller manager configuration
 controllerManager:
   # Manager configuration
@@ -62,33 +52,3 @@ controllerManager:
 imagePullSecrets: []
 # -- Kubernetes cluster domain used for DNS resolution (default: "cluster.local")
 kubernetesClusterDomain: cluster.local
-# Service account configuration for NFS controller plugin
-nfsCtrlpluginSa:
-  serviceAccount:
-    # -- Annotations to add to the NFS controller plugin service account (default: {})
-    annotations: {}
-# Service account configuration for NFS node plugin
-nfsNodepluginSa:
-  serviceAccount:
-    # -- Annotations to add to the NFS node plugin service account (default: {})
-    annotations: {}
-# Service account configuration for NVMe-oF controller plugin
-nvmeofCtrlpluginSa:
-  serviceAccount:
-    # -- Annotations to add to the NVMe-oF controller plugin service account (default: {})
-    annotations: {}
-# Service account configuration for NVMe-oF node plugin
-nvmeofNodepluginSa:
-  serviceAccount:
-    # -- Annotations to add to the NVMe-oF node plugin service account (default: {})
-    annotations: {}
-# Service account configuration for RBD controller plugin
-rbdCtrlpluginSa:
-  serviceAccount:
-    # -- Annotations to add to the RBD controller plugin service account (default: {})
-    annotations: {}
-# Service account configuration for RBD node plugin
-rbdNodepluginSa:
-  serviceAccount:
-    # -- Annotations to add to the RBD node plugin service account (default: {})
-    annotations: {}
diff --git a/docs/helm-charts/operator-chart.md b/docs/helm-charts/operator-chart.md
index 7bc68871..a2b2ac98 100644
--- a/docs/helm-charts/operator-chart.md
+++ b/docs/helm-charts/operator-chart.md
@@ -44,8 +44,6 @@ The following table lists the configurable parameters of the ceph-csi-operator c
 
 | Parameter | Description | Default |
 |-----------|-------------|---------|
-| `cephfsCtrlpluginSa.serviceAccount.annotations` | Annotations to add to the CephFS controller plugin service account (default: {}) | `{}` |
-| `cephfsNodepluginSa.serviceAccount.annotations` | Annotations to add to the CephFS node plugin service account (default: {}) | `{}` |
 | `controllerManager.manager.args` | Arguments to pass to the manager container (default: ["--leader-elect"]) | `["--leader-elect"]` |
 | `controllerManager.manager.containerSecurityContext.allowPrivilegeEscalation` | Disallow privilege escalation for the manager container (default: false) | `false` |
 | `controllerManager.manager.containerSecurityContext.capabilities.drop` | List of capabilities to drop from the manager container (default: ["ALL"]) | `["ALL"]` |
@@ -63,12 +61,6 @@ The following table lists the configurable parameters of the ceph-csi-operator c
 | `controllerManager.serviceAccount.annotations` | Annotations to add to the controller manager service account (default: {}) | `{}` |
 | `imagePullSecrets` | List of image pull secret names for pulling container images (default: []) | `[]` |
 | `kubernetesClusterDomain` | Kubernetes cluster domain used for DNS resolution (default: "cluster.local") | `"cluster.local"` |
-| `nfsCtrlpluginSa.serviceAccount.annotations` | Annotations to add to the NFS controller plugin service account (default: {}) | `{}` |
-| `nfsNodepluginSa.serviceAccount.annotations` | Annotations to add to the NFS node plugin service account (default: {}) | `{}` |
-| `nvmeofCtrlpluginSa.serviceAccount.annotations` | Annotations to add to the NVMe-oF controller plugin service account (default: {}) | `{}` |
-| `nvmeofNodepluginSa.serviceAccount.annotations` | Annotations to add to the NVMe-oF node plugin service account (default: {}) | `{}` |
-| `rbdCtrlpluginSa.serviceAccount.annotations` | Annotations to add to the RBD controller plugin service account (default: {}) | `{}` |
-| `rbdNodepluginSa.serviceAccount.annotations` | Annotations to add to the RBD node plugin service account (default: {}) | `{}` |
 
 ### **Development Build**