diff --git a/manifests/common/app.yaml b/manifests/common/app.yaml
index 8c205b3..aa4a2fc 100644
--- a/manifests/common/app.yaml
+++ b/manifests/common/app.yaml
@@ -54,6 +54,8 @@ spec:
       labels:
         app: app
     spec:
+      nodeSelector:
+        type: main
       containers:
         - name: app
           image: "$IMAGEAPP"
@@ -85,7 +87,6 @@ spec:
       spec:
         accessModes:
           - ReadWriteOnce
-        storageClassName: nfs-csi
         resources:
           requests:
             storage: 1Gi
diff --git a/manifests/common/db.yaml b/manifests/common/db.yaml
index 72169ac..95cc80b 100644
--- a/manifests/common/db.yaml
+++ b/manifests/common/db.yaml
@@ -7,3 +7,6 @@ spec:
   instances: $NB_REPLICAS
   storage:
     size: 1Gi
+  affinity:
+    nodeSelector:
+      type: main
diff --git a/manifests/common/runner.yaml b/manifests/common/runner.yaml
index 7bd276f..edcc290 100644
--- a/manifests/common/runner.yaml
+++ b/manifests/common/runner.yaml
@@ -17,6 +17,8 @@ spec:
     spec:
       securityContext:
         fsGroup: 1000
+      nodeSelector:
+        type: data
       containers:
         - name: runner
           image: "$IMAGERUNNER"
@@ -47,7 +49,6 @@ spec:
       spec:
         accessModes:
           - ReadWriteOnce
-        storageClassName: nfs-csi
         resources:
           requests:
             storage: 10Mi