diff --git a/deployment/kubernetes/indexing_model_server-service-deployment.yaml b/deployment/kubernetes/indexing_model_server-service-deployment.yaml
index d44b52e92..a7dde82cb 100644
--- a/deployment/kubernetes/indexing_model_server-service-deployment.yaml
+++ b/deployment/kubernetes/indexing_model_server-service-deployment.yaml
@@ -57,3 +57,18 @@ spec:
   resources:
     requests:
       storage: 3Gi
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: indexing-model-server-volume
+  labels:
+    type: local
+spec:
+  capacity:
+    storage: 3Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/mnt/data"
+  persistentVolumeReclaimPolicy: Delete
\ No newline at end of file
diff --git a/deployment/kubernetes/inference_model_server-service-deployment.yaml b/deployment/kubernetes/inference_model_server-service-deployment.yaml
index 790dc633d..062c2ef46 100644
--- a/deployment/kubernetes/inference_model_server-service-deployment.yaml
+++ b/deployment/kubernetes/inference_model_server-service-deployment.yaml
@@ -54,3 +54,18 @@ spec:
   resources:
     requests:
       storage: 3Gi
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: inference-model-server-volume
+  labels:
+    type: local
+spec:
+  capacity:
+    storage: 3Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/mnt/data"
+  persistentVolumeReclaimPolicy: Delete
\ No newline at end of file
diff --git a/deployment/kubernetes/postgres-service-deployment.yaml b/deployment/kubernetes/postgres-service-deployment.yaml
index 33f2200b8..868e1ff0e 100644
--- a/deployment/kubernetes/postgres-service-deployment.yaml
+++ b/deployment/kubernetes/postgres-service-deployment.yaml
@@ -56,3 +56,20 @@ spec:
         requests:
           # Adjust the storage request size as needed.
           storage: 5Gi
+      storageClassName: relational-db-storage
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: relational-db-pv
+  labels:
+    type: local
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/mnt/data"
+  persistentVolumeReclaimPolicy: Delete
+  storageClassName: relational-db-storage
\ No newline at end of file
diff --git a/deployment/kubernetes/secrets.yaml b/deployment/kubernetes/secrets.yaml
index d4cc9e2a7..ab7b834e9 100644
--- a/deployment/kubernetes/secrets.yaml
+++ b/deployment/kubernetes/secrets.yaml
@@ -10,4 +10,3 @@ data:
   google_oauth_client_id: ZXhhbXBsZS1jbGllbnQtaWQ= # "example-client-id" base64 encoded. You will need to provide this, use echo -n "your-client-id" | base64
   google_oauth_client_secret: ZXhhbXBsZV9nb29nbGVfb2F1dGhfc2VjcmV0 # "example-client-secret" base64 encoded. You will need to provide this, use echo -n "your-client-id" | base64
   redis_password: cGFzc3dvcmQ= # "password" base64 encoded
-  
\ No newline at end of file
diff --git a/deployment/kubernetes/vespa-service-deployment.yaml b/deployment/kubernetes/vespa-service-deployment.yaml
index 5016258b7..e88738829 100644
--- a/deployment/kubernetes/vespa-service-deployment.yaml
+++ b/deployment/kubernetes/vespa-service-deployment.yaml
@@ -49,15 +49,31 @@ spec:
             port: 19071
             scheme: HTTP
         volumeMounts:
-        - name: vespa-storage
+        - name: vespa-volume
           mountPath: /opt/vespa/var/
   volumeClaimTemplates:
   - metadata:
-      name: vespa-storage
+      name: vespa-volume
     spec:
-      accessModes:
-      - ReadWriteOnce
+      accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
           # Adjust the storage request size as needed.
           storage: 5Gi
+      storageClassName: vespa-storage
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: vespa-pv
+  labels:
+    type: local
+spec:
+  capacity:
+    storage: 5Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/mnt/vespa"
+  persistentVolumeReclaimPolicy: Delete
+  storageClassName: vespa-storage
\ No newline at end of file