diff --git a/ceph/ceph-conf.yaml b/ceph/ceph-conf.yaml
index eace624..576be08 100644
--- a/ceph/ceph-conf.yaml
+++ b/ceph/ceph-conf.yaml
@@ -23,4 +23,5 @@ data:
   # keyring is a required key and its value should be empty
   keyring: |
 metadata:
-  name: ceph-config
\ No newline at end of file
+  name: ceph-config
+  namespace: ceph
\ No newline at end of file
diff --git a/ceph/csi-cephfsplugin-provisioner.yaml b/ceph/csi-cephfsplugin-provisioner.yaml
index 49fd37e..1ebd76d 100644
--- a/ceph/csi-cephfsplugin-provisioner.yaml
+++ b/ceph/csi-cephfsplugin-provisioner.yaml
@@ -3,6 +3,7 @@ kind: Service
 apiVersion: v1
 metadata:
   name: csi-cephfsplugin-provisioner
+  namespace: ceph
   labels:
     app: csi-metrics
 spec:
@@ -19,6 +20,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: csi-cephfsplugin-provisioner
+  namespace: ceph
 spec:
   selector:
     matchLabels:
diff --git a/ceph/csi-cephfsplugin.yaml b/ceph/csi-cephfsplugin.yaml
index 0b1bf73..03e6013 100644
--- a/ceph/csi-cephfsplugin.yaml
+++ b/ceph/csi-cephfsplugin.yaml
@@ -3,6 +3,7 @@ kind: DaemonSet
 apiVersion: apps/v1
 metadata:
   name: csi-cephfsplugin
+  namespace: ceph
 spec:
   selector:
     matchLabels:
@@ -198,6 +199,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: csi-metrics-cephfsplugin
+  namespace: ceph
   labels:
     app: csi-metrics
 spec:
diff --git a/terraform/control-plane1.bu b/terraform/control-plane1.bu
index 1c6af3f..5fedb1d 100644
--- a/terraform/control-plane1.bu
+++ b/terraform/control-plane1.bu
@@ -435,15 +435,20 @@ systemd:
         ExecStart=/bin/sleep 30s
         ExecStart=/bin/sh -c 'echo "create ceph namespace..."'
         ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/namespace.yaml
+        
+        ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/csi-nodeplugin-rbac.yaml
+        ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/csi-provisioner-rbac.yaml
+
+        ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/secrets.yaml
+
         ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/ceph-conf.yaml
         ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/csi-cephfsplugin-provisioner.yaml
         ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/csi-cephfsplugin.yaml
         ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/csi-config-map.yaml
         ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/csi-encryption-kms-config.yaml
-        ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/csi-nodeplugin-rbac.yaml
-        ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/csi-provisioner-rbac.yaml
+        
         ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/csidriver.yaml
-        ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/secrets.yaml
+        
         ExecStart=-/opt/bin/kubectl apply -f http://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/ceph/storage-class.yaml
         
         ExecStart=/usr/bin/systemctl disable install-ceph.service