diff --git a/k8s/calibrate/values-stage.yaml b/k8s/calibrate/values-stage.yaml
index 9c23a1d0fb..9bd7ea1242 100644
--- a/k8s/calibrate/values-stage.yaml
+++ b/k8s/calibrate/values-stage.yaml
@@ -20,7 +20,7 @@ service:
 resources:
   limits:
     cpu: 50m
-    memory: 80Mi
+    memory: 100Mi
   requests:
     cpu: 5m
     memory: 20Mi
@@ -28,25 +28,19 @@ autoscaling:
   minReplicas: 1
   maxReplicas: 2
   targetMemoryUtilizationPercentage: 80
-nodeSelector: {}
+nodeSelector: 
+  role: control-plane
 tolerations: []
 affinity:
   nodeAffinity:
     preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 10
-        preference:
+      - preference:
           matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - general-purpose
-      - weight: 1
-        preference:
-          matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - high-memory
+          - key: role
+            operator: In
+            values:
+            - control-plane
+        weight: 1
 app:
   name: airqo-stage-calibrate-app
   label: sta-calibrate-app
diff --git a/k8s/docs/values-stage.yaml b/k8s/docs/values-stage.yaml
index 92b0650dcb..d0a7c4553c 100644
--- a/k8s/docs/values-stage.yaml
+++ b/k8s/docs/values-stage.yaml
@@ -22,24 +22,25 @@ resources:
     cpu: 50m
     memory: 100Mi
   requests:
-    cpu: 10m
+    cpu: 1m
     memory: 20Mi
 autoscaling:
   minReplicas: 1
   maxReplicas: 2
   targetCPUUtilizationPercentage: 80
-nodeSelector: {}
+nodeSelector: 
+  role: control-plane
 tolerations: []
 affinity:
   nodeAffinity:
     preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 10
-        preference:
+      - preference:
           matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - general-purpose
+          - key: role
+            operator: In
+            values:
+            - control-plane
+        weight: 1
 app:
   name: airqo-stage-docs
   label: sta-docs
diff --git a/k8s/inventory/values-stage.yaml b/k8s/inventory/values-stage.yaml
index f6d7790d20..6685fa62d8 100644
--- a/k8s/inventory/values-stage.yaml
+++ b/k8s/inventory/values-stage.yaml
@@ -13,15 +13,16 @@ service:
   port: 8000
 ingress:
   enabled: false
-nodeSelector: {}
+nodeSelector: 
+  role: control-plane
 torelations: {}
 resources:
   requests:
-    cpu: 5m
+    cpu: 10m
     memory: 20Mi
   limits:
     cpu: 50m
-    memory: 80Mi
+    memory: 150Mi
 autoscaling:
   minReplicas: 1
   maxReplicas: 2
@@ -29,20 +30,13 @@ autoscaling:
 affinity:
   nodeAffinity:
     preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 10
-        preference:
+      - preference:
           matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - general-purpose
-      - weight: 1
-        preference:
-          matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - high-memory
+          - key: role
+            operator: In
+            values:
+            - control-plane
+        weight: 1
 app:
   name: airqo-stage-inventory
   label: airqo-inventory
diff --git a/k8s/netmanager/values-stage.yaml b/k8s/netmanager/values-stage.yaml
index 8b3338d98b..1cdef83716 100644
--- a/k8s/netmanager/values-stage.yaml
+++ b/k8s/netmanager/values-stage.yaml
@@ -13,7 +13,8 @@ service:
   port: 80
 ingress:
   enabled: false
-nodeSelector: {}
+nodeSelector: 
+  role: control-plane
 torelations: {}
 resources:
   requests:
@@ -29,20 +30,13 @@ autoscaling:
 affinity:
   nodeAffinity:
     preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 10
-        preference:
+      - preference:
           matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - general-purpose
-      - weight: 1
-        preference:
-          matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - high-memory
+          - key: role
+            operator: In
+            values:
+            - control-plane
+        weight: 1
 app:
   name: airqo-stage-platform-frontend
   label: airqo-platform
diff --git a/k8s/platform/values-stage.yaml b/k8s/platform/values-stage.yaml
index 7488764af2..aef3905adb 100644
--- a/k8s/platform/values-stage.yaml
+++ b/k8s/platform/values-stage.yaml
@@ -20,33 +20,28 @@ ingress:
 resources:
   limits:
     cpu: 200m
-    memory: 700Mi
+    memory: 350Mi
   requests:
-    cpu: 100m
-    memory: 250Mi
+    cpu: 20m
+    memory: 150Mi
+
 autoscaling:
   minReplicas: 1
   maxReplicas: 3
   targetCPUUtilizationPercentage: 80
-nodeSelector: {}
+nodeSelector: 
+  role: control-plane
 tolerations: []
 affinity:
   nodeAffinity:
     preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 10
-        preference:
-          matchExpressions:
-            - key: node-type
+        - preference:
+            matchExpressions:
+            - key: role
               operator: In
               values:
-                - general-purpose
-      - weight: 1
-        preference:
-          matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - high-memory
+              - control-plane
+          weight: 1
 app:
   name: airqo-stage-next-platform
   label: sta-next-platform
diff --git a/k8s/reports/values-stage.yaml b/k8s/reports/values-stage.yaml
index 0e7eb4ba48..cde62883a0 100644
--- a/k8s/reports/values-stage.yaml
+++ b/k8s/reports/values-stage.yaml
@@ -13,36 +13,30 @@ service:
   port: 3000
 ingress:
   enabled: false
-nodeSelector: {}
 torelations: {}
 resources:
   requests:
-    cpu: 5m
-    memory: 20Mi
+    cpu: 10m
+    memory: 150Mi
   limits:
     cpu: 50m
-    memory: 80Mi
+    memory: 200Mi
 autoscaling:
   minReplicas: 1
   maxReplicas: 3
   targetMemoryUtilizationPercentage: 80
+nodeSelector: 
+  role: control-plane
 affinity:
   nodeAffinity:
     preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 10
-        preference:
+      - preference:
           matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - general-purpose
-      - weight: 1
-        preference:
-          matchExpressions:
-            - key: node-type
-              operator: In
-              values:
-                - high-memory
+          - key: role
+            operator: In
+            values:
+            - control-plane
+        weight: 1
 app:
   name: airqo-stage-reports
   label: airqo-reports