diff --git a/apps-kustomized/rook-cluster/blockpool-ssd.yaml b/apps-kustomized/rook-cluster-ssd/blockpool-ssd.yaml
similarity index 100%
rename from apps-kustomized/rook-cluster/blockpool-ssd.yaml
rename to apps-kustomized/rook-cluster-ssd/blockpool-ssd.yaml
diff --git a/apps-kustomized/rook-cluster/cluster-ssd.yaml b/apps-kustomized/rook-cluster-ssd/cluster-ssd.yaml
similarity index 58%
rename from apps-kustomized/rook-cluster/cluster-ssd.yaml
rename to apps-kustomized/rook-cluster-ssd/cluster-ssd.yaml
index 8cd96f0..b1d69fc 100644
--- a/apps-kustomized/rook-cluster/cluster-ssd.yaml
+++ b/apps-kustomized/rook-cluster-ssd/cluster-ssd.yaml
@@ -1,24 +1,10 @@
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: rook-config-override
-  namespace: rook-ceph # namespace:cluster
-data:
-  config: |
-    [global]
-    osd_pool_default_size = 1
-    mon_warn_on_pool_no_redundancy = false
-    bdev_flock_retry = 20
-    bluefs_buffered_io = false
-    mon_data_avail_warn = 10
----
 apiVersion: ceph.rook.io/v1
 kind: CephCluster
 metadata:
   name: ssd-cluster
   namespace: rook-ceph # namespace:cluster
 spec:
-  dataDirHostPath: /var/lib/rook
+  dataDirHostPath: /var/lib/rook-cluster-ssd
   cephVersion:
     image: quay.io/ceph/ceph:v18
     allowUnsupported: true
@@ -33,7 +19,7 @@ spec:
   crashCollector:
     disable: true
   storage:
-    useAllNodes: true
+    useAllNodes: false
     useAllDevices: false
     #deviceFilter:
     nodes:
@@ -54,14 +40,3 @@ spec:
     mgr: system-cluster-critical
   disruptionManagement:
     managePodBudgets: true
----
-apiVersion: ceph.rook.io/v1
-kind: CephBlockPool
-metadata:
-  name: builtin-mgr
-  namespace: rook-ceph # namespace:cluster
-spec:
-  name: .mgr
-  replicated:
-    size: 1
-    requireSafeReplicaSize: false
diff --git a/apps-kustomized/rook-cluster-ssd/configmap.yaml b/apps-kustomized/rook-cluster-ssd/configmap.yaml
new file mode 100644
index 0000000..1fd662e
--- /dev/null
+++ b/apps-kustomized/rook-cluster-ssd/configmap.yaml
@@ -0,0 +1,13 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: rook-config-override
+  namespace: rook-ceph # namespace:cluster
+data:
+  config: |
+    [global]
+    osd_pool_default_size = 1
+    mon_warn_on_pool_no_redundancy = false
+    bdev_flock_retry = 20
+    bluefs_buffered_io = false
+    mon_data_avail_warn = 10
diff --git a/apps-kustomized/rook-cluster/storageclass-ssd-fs.yaml b/apps-kustomized/rook-cluster-ssd/storageclass-ssd-fs.yaml
similarity index 66%
rename from apps-kustomized/rook-cluster/storageclass-ssd-fs.yaml
rename to apps-kustomized/rook-cluster-ssd/storageclass-ssd-fs.yaml
index 6c3c7ca..aa19518 100644
--- a/apps-kustomized/rook-cluster/storageclass-ssd-fs.yaml
+++ b/apps-kustomized/rook-cluster-ssd/storageclass-ssd-fs.yaml
@@ -13,10 +13,10 @@ parameters:
     pool: replicapool-ssd
 
     # The secrets contain Ceph admin credentials.
-    csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
-    csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph-data
-    csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node
-    csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph-data
+    csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner
+    csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
+    csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node
+    csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph
 
 # Delete the rbd volume when a PVC is deleted
 reclaimPolicy: Delete
diff --git a/apps-kustomized/rook-cluster/storageclass-ssd.yaml b/apps-kustomized/rook-cluster-ssd/storageclass-ssd.yaml
similarity index 88%
rename from apps-kustomized/rook-cluster/storageclass-ssd.yaml
rename to apps-kustomized/rook-cluster-ssd/storageclass-ssd.yaml
index 6379691..6772ad1 100644
--- a/apps-kustomized/rook-cluster/storageclass-ssd.yaml
+++ b/apps-kustomized/rook-cluster-ssd/storageclass-ssd.yaml
@@ -18,9 +18,9 @@ parameters:
 
     # The secrets contain Ceph admin credentials.
     csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
-    csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph-data
+    csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
     csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node
-    csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph-data
+    csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph
 
     # Specify the filesystem type of the volume. If not specified, csi-provisioner
     # will set default as `ext4`.