diff --git a/ci-scripts/charts/mysql/values.yaml b/ci-scripts/charts/mysql/values.yaml
index d7935112b8e3046069bb2954a02ff478473c9d8b..beb7912f835df444680bcdbe65135bca8ca30bf4 100644
--- a/ci-scripts/charts/mysql/values.yaml
+++ b/ci-scripts/charts/mysql/values.yaml
@@ -72,7 +72,8 @@ extraInitContainers: |
 
 ## Node selector
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
-nodeSelector: {}
+nodeSelector:
+  env: dev
 
 ## Affinity
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
diff --git a/ci-scripts/charts/oai-amf/templates/deployment.yaml b/ci-scripts/charts/oai-amf/templates/deployment.yaml
index 74bacd5eada18848e009efeb8c147c5791844bdb..7bb9e6e894c6c75d8b581726bf4178a8a3bb22dc 100644
--- a/ci-scripts/charts/oai-amf/templates/deployment.yaml
+++ b/ci-scripts/charts/oai-amf/templates/deployment.yaml
@@ -310,6 +310,10 @@ spec:
       - name: cn5g-pv
         persistentVolumeClaim:
           claimName: cn5g-pvc
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
diff --git a/ci-scripts/charts/oai-amf/values.yaml b/ci-scripts/charts/oai-amf/values.yaml
index 61a9c0a7821616f98a707ef612641f5b0963b58f..50d5193a190fb67a2faa6a1d90a00b66118b9a1b 100644
--- a/ci-scripts/charts/oai-amf/values.yaml
+++ b/ci-scripts/charts/oai-amf/values.yaml
@@ -119,7 +119,8 @@ resources:
     cpu: 100m
     memory: 256Mi
 
-nodeSelector: {}
+nodeSelector:
+  env: dev
 
 tolerations: []
 
diff --git a/ci-scripts/charts/oai-nrf/templates/deployment.yaml b/ci-scripts/charts/oai-nrf/templates/deployment.yaml
index 8d6f1ad92b3394f26d46558ff6b2ce6ba5f831ab..dcc5b6e21dc7908a0fadf062893f697951090c88 100644
--- a/ci-scripts/charts/oai-nrf/templates/deployment.yaml
+++ b/ci-scripts/charts/oai-nrf/templates/deployment.yaml
@@ -91,6 +91,10 @@ spec:
       - name: cn5g-pv
         persistentVolumeClaim:
           claimName: cn5g-pvc
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
diff --git a/ci-scripts/charts/oai-nrf/values.yaml b/ci-scripts/charts/oai-nrf/values.yaml
index 4cf56495374c3b33634a86012fc2e6afb0ef74b3..e1ba0c031afabf9d21025365b6f438d5f88e5318 100644
--- a/ci-scripts/charts/oai-nrf/values.yaml
+++ b/ci-scripts/charts/oai-nrf/values.yaml
@@ -74,7 +74,8 @@ resources:
   #  cpu: 100m
   #  memory: 256Mi
 
-nodeSelector: {}
+nodeSelector:
+  env: dev
 
 tolerations: []
 
diff --git a/ci-scripts/charts/oai-smf/templates/deployment.yaml b/ci-scripts/charts/oai-smf/templates/deployment.yaml
index 33ee80ab50eb4397f9e22048a6877252bbfff132..5505fdf56836416e7d359e181031f3a4e5b2e7bc 100644
--- a/ci-scripts/charts/oai-smf/templates/deployment.yaml
+++ b/ci-scripts/charts/oai-smf/templates/deployment.yaml
@@ -201,6 +201,10 @@ spec:
       - name: cn5g-pv
         persistentVolumeClaim:
           claimName: cn5g-pvc
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
diff --git a/ci-scripts/charts/oai-smf/values.yaml b/ci-scripts/charts/oai-smf/values.yaml
index 4907c71b1bd39b02c692cf1ab0bbaa7a93cf6562..d20d7394bc9ca99a87b83ec0dd3e0c26081df25f 100644
--- a/ci-scripts/charts/oai-smf/values.yaml
+++ b/ci-scripts/charts/oai-smf/values.yaml
@@ -97,7 +97,8 @@ resources:
   #  cpu: 100m
   #  memory: 256Mi
 
-
+nodeSelector:
+  env: dev
 
 tolerations: []
 
diff --git a/ci-scripts/charts/oai-spgwu-tiny/templates/deployment.yaml b/ci-scripts/charts/oai-spgwu-tiny/templates/deployment.yaml
index 455654b1df3f19bb153511ad5c27a511b4eafdaf..5112c9d750d54995a78de8ec212e663a71765fa1 100644
--- a/ci-scripts/charts/oai-spgwu-tiny/templates/deployment.yaml
+++ b/ci-scripts/charts/oai-spgwu-tiny/templates/deployment.yaml
@@ -231,6 +231,10 @@ spec:
       - name: cn5g-pv
         persistentVolumeClaim:
           claimName: cn5g-pvc  
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
diff --git a/ci-scripts/charts/oai-spgwu-tiny/values.yaml b/ci-scripts/charts/oai-spgwu-tiny/values.yaml
index 8be1e55373370ab2f296371213488189d28fad3e..2f81f9ec415f927987abcf453266694e2041d379 100644
--- a/ci-scripts/charts/oai-spgwu-tiny/values.yaml
+++ b/ci-scripts/charts/oai-spgwu-tiny/values.yaml
@@ -101,7 +101,8 @@ resources:
     cpu: 8
     memory: 256Mi
 
-nodeSelector: {}
+nodeSelector:
+  env: dev
 
 tolerations: []