diff --git a/kustomize-nfs/dkube/base/dkube.yaml b/kustomize-nfs/dkube/base/dkube.yaml
index 01066ae..7b019c4 100644
--- a/kustomize-nfs/dkube/base/dkube.yaml
+++ b/kustomize-nfs/dkube/base/dkube.yaml
@@ -36,8 +36,6 @@ spec:
           value: nfsServer
         - name: NFS_BASE_PATH
           value: nfsBasePath
-        - name: CEPH_MONITORS
-          value: 'cephMonitors'
         - name: DKUBE_STORAGE_PROVIDER
           valueFrom:
             configMapKeyRef:
@@ -49,6 +47,10 @@ spec:
           value: dkubeClusterType
         - name: MODEL_REGISTRY
           value: modelRegistry
+        envFrom:
+        - configMapRef:
+            name: ceph-config
+            optional: true
         image: dkubeApiServerImage
         imagePullPolicy: IfNotPresent
         name: main
@@ -574,8 +576,6 @@ spec:
           value: nfsBasePath
         - name: DKUBE_APISERVER_ROLE
           value: master
-        - name: CEPH_MONITORS
-          value: 'cephMonitors'
         - name: DKUBE_STORAGE_PROVIDER
           valueFrom:
             configMapKeyRef:
@@ -585,6 +585,10 @@ spec:
           value: dkubeClusterType
         - name: MODEL_REGISTRY
           value: modelRegistry
+        envFrom:
+        - configMapRef:
+            name: ceph-config
+            optional: true
         image: dkubeApiServerImage
         imagePullPolicy: IfNotPresent
         name: main
diff --git a/kustomize/dkube/base/dkube.yaml b/kustomize/dkube/base/dkube.yaml
index 506aef4..83bea62 100644
--- a/kustomize/dkube/base/dkube.yaml
+++ b/kustomize/dkube/base/dkube.yaml
@@ -36,8 +36,6 @@ spec:
           value: nfsServer
         - name: NFS_BASE_PATH
           value: nfsBasePath
-        - name: CEPH_MONITORS
-          value: 'cephMonitors'
         - name: DKUBE_STORAGE_PROVIDER
           valueFrom:
             configMapKeyRef:
@@ -49,6 +47,10 @@ spec:
           value: dkubeClusterType
         - name: MODEL_REGISTRY
           value: modelRegistry
+        envFrom:
+        - configMapRef:
+            name: ceph-config
+            optional: true
         image: dkubeApiServerImage
         imagePullPolicy: IfNotPresent
         name: main
@@ -64,10 +66,12 @@ spec:
         volumeMounts:
         - mountPath: /home/dkube/d3s
           name: store
+          subPath: dkube
         - mountPath: /var/run/docker.sock
           name: docker
         - mountPath: /var/log/dkube
-          name: dkube-logs
+          subPath: dkube/system/logs/dkube
+          name: store
         - mountPath: /etc/dkube/dkube_platform_cfg
           name: pc
       - image: dkubeDownloaderImage
@@ -89,19 +93,8 @@ spec:
       serviceAccountName: dkube
       volumes:
       - name: store
-        cephfs:
-          monitors: cephMonitors
-          path: /dkube
-          user: admin
-          secretRef:
-            name: ceph-secret
-      - name: dkube-logs
-        cephfs:
-          monitors: cephMonitors
-          path: /dkube/system/logs/dkube
-          user: admin
-          secretRef:
-            name: ceph-secret
+        persistentVolumeClaim:
+          claimName: dkube-pvc
       - hostPath:
           path: /var/run/docker.sock
         name: docker
@@ -270,6 +263,7 @@ spec:
         volumeMounts:
         - mountPath: /var/log/dkube
           name: dkube-logs
+          subPath: dkube/system/logs/dkube
       dnsPolicy: ClusterFirst
       imagePullSecrets:
       - name: dkubeDockerSecret
@@ -279,12 +273,8 @@ spec:
       serviceAccountName: dkube
       volumes:
       - name: dkube-logs
-        cephfs:
-          monitors: cephMonitors
-          path: /dkube/system/logs/dkube
-          user: admin
-          secretRef:
-            name: ceph-secret
+        persistentVolumeClaim:
+          claimName: dkube-pvc
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -462,12 +452,8 @@ spec:
       terminationGracePeriodSeconds: 30
       volumes:
       - name: storage
-        cephfs:
-          monitors: cephMonitors
-          path: /
-          user: admin
-          secretRef:
-            name: ceph-secret
+        persistentVolumeClaim:
+          claimName: dkube-pvc
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -568,6 +554,7 @@ spec:
         volumeMounts:
         - mountPath: /dkube
           name: store
+          subPath: dkube
       - env:
         - name: DKUBE_MOUNT_PATH
           value: /home/dkube/d3s
@@ -587,8 +574,6 @@ spec:
           value: nfsBasePath
         - name: DKUBE_APISERVER_ROLE
           value: master
-        - name: CEPH_MONITORS
-          value: 'cephMonitors'
         - name: DKUBE_STORAGE_PROVIDER
           valueFrom:
             configMapKeyRef:
@@ -598,6 +583,10 @@ spec:
           value: dkubeClusterType
         - name: MODEL_REGISTRY
           value: modelRegistry
+        envFrom:
+        - configMapRef:
+            name: ceph-config
+            optional: true
         image: dkubeApiServerImage
         imagePullPolicy: IfNotPresent
         name: main
@@ -613,10 +602,12 @@ spec:
         volumeMounts:
         - mountPath: /home/dkube/d3s
           name: store
+          subPath: dkube
         - mountPath: /var/run/docker.sock
           name: docker
         - mountPath: /var/log/dkube
-          name: dkube-logs
+          name: store
+          subPath: dkube/system/logs/dkube
         - mountPath: /etc/dkube/dkube_platform_cfg
           name: pc
       dnsConfig:
@@ -633,19 +624,8 @@ spec:
       serviceAccountName: dkube
       volumes:
       - name: store
-        cephfs:
-          monitors: cephMonitors
-          path: /dkube
-          user: admin
-          secretRef:
-            name: ceph-secret
-      - name: dkube-logs
-        cephfs:
-          monitors: cephMonitors
-          path: /dkube/system/logs/dkube
-          user: admin
-          secretRef:
-            name: ceph-secret
+        persistentVolumeClaim:
+          claimName: dkube-pvc
       - hostPath:
           path: /var/run/docker.sock
         name: docker