diff --git a/execution/infrastructure/grafana/values.yaml b/execution/infrastructure/grafana/values.yaml
index 211a72a61a2699c7108ec4adb9a7edebbccecb69..ab5ca4e19e7de411935b4cb0c75eedf05642f5b8 100644
--- a/execution/infrastructure/grafana/values.yaml
+++ b/execution/infrastructure/grafana/values.yaml
@@ -51,4 +51,7 @@ sidecar:
 
 service:
   nodePort: 31199
-  type: NodePort
\ No newline at end of file
+  type: NodePort
+
+nodeSelector:
+  env: dev
diff --git a/execution/infrastructure/kafka-lag-exporter/values.yaml b/execution/infrastructure/kafka-lag-exporter/values.yaml
index b83a911283a7e8264f982f9eb5d550ad5497ec9d..a18f8b13402c968bc5971416861f2cd8eb5d5d2f 100644
--- a/execution/infrastructure/kafka-lag-exporter/values.yaml
+++ b/execution/infrastructure/kafka-lag-exporter/values.yaml
@@ -1,3 +1,6 @@
+nodeSelector:
+  env: dev
+
 clusters:
   - name: "my-confluent-cp-kafka"
     bootstrapBrokers: "my-confluent-cp-kafka:9092"
diff --git a/execution/infrastructure/kafka/kafka-client.yaml b/execution/infrastructure/kafka/kafka-client.yaml
index 4c7d3ed239faed62022c110e92b264b338a8c9a4..371fb31c2a17af098a761d0b6c76408a662e6e14 100644
--- a/execution/infrastructure/kafka/kafka-client.yaml
+++ b/execution/infrastructure/kafka/kafka-client.yaml
@@ -9,4 +9,6 @@ spec:
     command:
       - sh
       - -c
-      - "exec tail -f /dev/null"
\ No newline at end of file
+      - "exec tail -f /dev/null"
+  nodeSelector:
+    env: dev
\ No newline at end of file
diff --git a/execution/infrastructure/kafka/values.yaml b/execution/infrastructure/kafka/values.yaml
index 51dcb09d5f24579b148811c8a1c27fe165c3fb56..b05ad5500b499493cd8401aeffa465e9b82a0280 100644
--- a/execution/infrastructure/kafka/values.yaml
+++ b/execution/infrastructure/kafka/values.yaml
@@ -22,6 +22,8 @@ cp-zookeeper:
   #  requests:
   #   cpu: 100m
   #   memory: 128Mi
+  nodeSelector:
+    env: dev
 
 ## ------------------------------------------------------
 ## Kafka
@@ -47,6 +49,8 @@ cp-kafka:
   #  requests:
   #   cpu: 100m
   #   memory: 128Mi
+  nodeSelector:
+    env: dev
   configurationOverrides:
     #"offsets.topic.replication.factor": "3"
     "message.max.bytes": "134217728" # 128 MB
@@ -78,6 +82,8 @@ cp-schema-registry:
   #  requests:
   #   cpu: 100m
   #   memory: 128Mi
+  nodeSelector:
+    env: dev
 
 cp-kafka-rest:
   enabled: false
diff --git a/execution/infrastructure/prometheus/helm-values.yaml b/execution/infrastructure/prometheus/helm-values.yaml
index bf503fe483e918ac7a6a7dc8722ea06cfd3aef6c..f6c319806b6f697d48456561982841ea77be7a8e 100644
--- a/execution/infrastructure/prometheus/helm-values.yaml
+++ b/execution/infrastructure/prometheus/helm-values.yaml
@@ -36,6 +36,8 @@ nodeExporter:
 
 prometheusOperator:
   enabled: true
+  nodeSelector:
+    env: dev
 
 prometheus:
   enabled: false
diff --git a/execution/infrastructure/prometheus/prometheus.yaml b/execution/infrastructure/prometheus/prometheus.yaml
index 2cec39877386cc06408783c372521025883310da..e14ebd4dde767abe33cdc018af34635f3d33d055 100644
--- a/execution/infrastructure/prometheus/prometheus.yaml
+++ b/execution/infrastructure/prometheus/prometheus.yaml
@@ -11,5 +11,8 @@ spec:
   resources:
     requests:
       memory: 400Mi
+  nodeSelector:
+    env: dev
   #scrapeInterval: 1s
-  enableAdminAPI: true
\ No newline at end of file
+  enableAdminAPI: true
+  
\ No newline at end of file
diff --git a/execution/uc1-application/aggregation-deployment.yaml b/execution/uc1-application/aggregation-deployment.yaml
index aa9d2655908506b0da3c15f631683bd6832b6b64..60e8271104c07602073b135189834ccf39b1b7a9 100644
--- a/execution/uc1-application/aggregation-deployment.yaml
+++ b/execution/uc1-application/aggregation-deployment.yaml
@@ -50,4 +50,6 @@ spec:
       volumes:
         - name: jmx-config
           configMap:
-            name: aggregation-jmx-configmap
\ No newline at end of file
+            name: aggregation-jmx-configmap
+      nodeSelector:
+        env: dev
diff --git a/execution/uc1-workload-generator/deployment.yaml b/execution/uc1-workload-generator/deployment.yaml
index f1bdfeb0e8f0baedb2a48baca3704dc292d58a29..d1018a4f4f5f0db3377009746bbde0df9b1b74da 100644
--- a/execution/uc1-workload-generator/deployment.yaml
+++ b/execution/uc1-workload-generator/deployment.yaml
@@ -28,4 +28,5 @@ spec:
               fieldPath: metadata.name
         - name: INSTANCES
           value: "{{INSTANCES}}"
-          
\ No newline at end of file
+      nodeSelector:
+        env: dev
diff --git a/execution/uc2-application/aggregation-deployment.yaml b/execution/uc2-application/aggregation-deployment.yaml
index c18d9a20a4ce07f8cbc2c078333e90791fd9e027..a5d7b0c83dcf162a3c8a4c9ee0c2003b48084a9a 100644
--- a/execution/uc2-application/aggregation-deployment.yaml
+++ b/execution/uc2-application/aggregation-deployment.yaml
@@ -50,4 +50,6 @@ spec:
       volumes:
         - name: jmx-config
           configMap:
-            name: aggregation-jmx-configmap
\ No newline at end of file
+            name: aggregation-jmx-configmap
+      nodeSelector:
+        env: dev
diff --git a/execution/uc2-workload-generator/deployment.yaml b/execution/uc2-workload-generator/deployment.yaml
index c4a7ca606cd174f2cb69abbfcf4be3f6f6bf1521..ddea819a47f349df438636975cd0fe584fafd796 100644
--- a/execution/uc2-workload-generator/deployment.yaml
+++ b/execution/uc2-workload-generator/deployment.yaml
@@ -25,4 +25,5 @@ spec:
           value: "4"
         - name: NUM_NESTED_GROUPS
           value: "{{NUM_NESTED_GROUPS}}"
-          
\ No newline at end of file
+      nodeSelector:
+        env: dev    
diff --git a/execution/uc3-application/aggregation-deployment.yaml b/execution/uc3-application/aggregation-deployment.yaml
index df470790f5672f224fde95d695c1d6ac5b1d158f..326c586fbb60ad1ec98e5004e47eae47eca579b8 100644
--- a/execution/uc3-application/aggregation-deployment.yaml
+++ b/execution/uc3-application/aggregation-deployment.yaml
@@ -52,4 +52,6 @@ spec:
       volumes:
         - name: jmx-config
           configMap:
-            name: aggregation-jmx-configmap
\ No newline at end of file
+            name: aggregation-jmx-configmap
+      nodeSelector:
+        env: dev
diff --git a/execution/uc3-workload-generator/deployment.yaml b/execution/uc3-workload-generator/deployment.yaml
index 5c8d0dde07380566395834144b7c8129e757f4fa..ad537d8782211df2f1d150a2c3b33d9f6dd38abe 100644
--- a/execution/uc3-workload-generator/deployment.yaml
+++ b/execution/uc3-workload-generator/deployment.yaml
@@ -28,4 +28,5 @@ spec:
               fieldPath: metadata.name
         - name: INSTANCES
           value: "{{INSTANCES}}"
-          
\ No newline at end of file
+      nodeSelector:
+        env: dev
diff --git a/execution/uc4-application/aggregation-deployment.yaml b/execution/uc4-application/aggregation-deployment.yaml
index 7c2df7d7502b39033960a1cade0dbfe6456dd70f..aac952fc266fab0684f2fa15e2e1503ba36bd073 100644
--- a/execution/uc4-application/aggregation-deployment.yaml
+++ b/execution/uc4-application/aggregation-deployment.yaml
@@ -54,4 +54,6 @@ spec:
       volumes:
         - name: jmx-config
           configMap:
-            name: aggregation-jmx-configmap
\ No newline at end of file
+            name: aggregation-jmx-configmap
+      nodeSelector:
+        env: dev
diff --git a/execution/uc4-workload-generator/deployment.yaml b/execution/uc4-workload-generator/deployment.yaml
index 9f7ad9ae2918fd6bc9b94f9f0af255325703eab3..85b7f86b68367ab39cd3ddf1066cd3e2a0b57d48 100644
--- a/execution/uc4-workload-generator/deployment.yaml
+++ b/execution/uc4-workload-generator/deployment.yaml
@@ -21,4 +21,5 @@ spec:
           value: "my-confluent-cp-kafka:9092"
         - name: NUM_SENSORS
           value: "{{NUM_SENSORS}}"
-          
\ No newline at end of file
+      nodeSelector:
+        env: dev