diff --git a/kubernetes/manifests/aerospike-cr-auth.yaml b/kubernetes/manifests/aerospike-cr-auth.yaml
index 003ccff..cf52c18 100644
--- a/kubernetes/manifests/aerospike-cr-auth.yaml
+++ b/kubernetes/manifests/aerospike-cr-auth.yaml
@@ -24,13 +24,28 @@ spec:
             size: 1Gi
       - name: avs-meta
         aerospike:
-          path: /avs/dev/xvdf
+          path: /avs-meta/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 2Gi
+      - name: avs-index
+        aerospike:
+          path: /avs-index/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 20Gi
+      - name: avs-data
+        aerospike:
+          path: /avs-data/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
             size: 20Gi
-
       - name: ns
         aerospike:
           path: /test/dev/xvdf
@@ -38,7 +53,7 @@ spec:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
-            size: 20Gi
+            size: 1Gi
       - name: aerospike-config-secret
         source:
           secret:
@@ -128,7 +143,18 @@ spec:
           type: device
           devices:
             - /test/dev/xvdf
-
+      - name: avs-index
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-index/dev/xvdf
+      - name: avs-data
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-data/dev/xvdf
       - name: avs-meta
         nsup-period: 600
         nsup-threads: 2
@@ -137,4 +163,4 @@ spec:
         storage-engine:
           type: device
           devices:
-            - /avs/dev/xvdf
\ No newline at end of file
+            - /avs-meta/dev/xvdf
\ No newline at end of file
diff --git a/kubernetes/manifests/aerospike-cr.yaml b/kubernetes/manifests/aerospike-cr.yaml
index 5ad7c84..29f1355 100644
--- a/kubernetes/manifests/aerospike-cr.yaml
+++ b/kubernetes/manifests/aerospike-cr.yaml
@@ -24,13 +24,28 @@ spec:
             size: 1Gi
       - name: avs-meta
         aerospike:
-          path: /avs/dev/xvdf
+          path: /avs-meta/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 2Gi
+      - name: avs-index
+        aerospike:
+          path: /avs-index/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 20Gi
+      - name: avs-data
+        aerospike:
+          path: /avs-data/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
             size: 20Gi
-
       - name: ns
         aerospike:
           path: /test/dev/xvdf
@@ -38,7 +53,7 @@ spec:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
-            size: 20Gi
+            size: 1Gi
       - name: aerospike-config-secret
         source:
           secret:
@@ -90,7 +105,18 @@ spec:
           type: device
           devices:
             - /test/dev/xvdf
-
+      - name: avs-index
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-index/dev/xvdf
+      - name: avs-data
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-data/dev/xvdf
       - name: avs-meta
         nsup-period: 600
         nsup-threads: 2
@@ -99,4 +125,4 @@ spec:
         storage-engine:
           type: device
           devices:
-            - /avs/dev/xvdf
\ No newline at end of file
+            - /avs-meta/dev/xvdf
\ No newline at end of file