diff --git a/execution/run_uc2-new.sh b/execution/run_uc2-new.sh
index 06dca8f32e1859a91f915fa438b1d36b670aaaa4..052c8ba5cd6a649e9768aada0d0c768b99ea0b7a 100755
--- a/execution/run_uc2-new.sh
+++ b/execution/run_uc2-new.sh
@@ -39,7 +39,7 @@ spec:
       - name: workload-generator
         env:
         - name: NUM_NESTED_GROUPS
-          value: $NUM_NESTED_GROUPS
+          value: "$NUM_NESTED_GROUPS"
 EOF
 kubectl apply -k uc2-workload-generator
 
diff --git a/execution/run_uc3-new.sh b/execution/run_uc3-new.sh
index 2526791eafa0cf9d4465726b1dfe6ff449ac41f7..85712030e4c14065dc3d3f7ef2dfeffadc02944a 100755
--- a/execution/run_uc3-new.sh
+++ b/execution/run_uc3-new.sh
@@ -42,9 +42,9 @@ spec:
       - name: workload-generator
         env:
         - name: NUM_SENSORS
-          value: $NUM_SENSORS
+          value: "$NUM_SENSORS"
         - name: INSTANCES
-          value: $WL_INSTANCES
+          value: "$WL_INSTANCES"
 EOF
 kubectl apply -k uc3-workload-generator
 
diff --git a/execution/run_uc4-new.sh b/execution/run_uc4-new.sh
index 76da28d9a4d169b156e4c9ec112c668f52e652a4..8f44d7247f08cd0426d6fada3e4d119453cb7241 100755
--- a/execution/run_uc4-new.sh
+++ b/execution/run_uc4-new.sh
@@ -39,7 +39,7 @@ spec:
       - name: workload-generator
         env:
         - name: NUM_SENSORS
-          value: $NUM_SENSORS
+          value: "$NUM_SENSORS"
 EOF
 kubectl apply -k uc4-workload-generator
 
diff --git a/execution/uc1-workload-generator/deployment.yaml b/execution/uc1-workload-generator/deployment.yaml
index d7324852684890406f76f1ca1cc878372749250a..0db431d58652f334a2bf4980f327502f1f2a0d86 100644
--- a/execution/uc1-workload-generator/deployment.yaml
+++ b/execution/uc1-workload-generator/deployment.yaml
@@ -21,7 +21,7 @@ spec:
         - name: KAFKA_BOOTSTRAP_SERVERS
           value: "my-confluent-cp-kafka:9092"
         - name: NUM_SENSORS
-          value: 25000
+          value: "25000"
         - name: POD_NAME
           valueFrom:
             fieldRef:
diff --git a/execution/uc1-workload-generator/kustomization.yaml b/execution/uc1-workload-generator/kustomization.yaml
index 17c5d2e1984ec7c76e60fcb27d7fb1a57e404405..faf86aa9aa2be42a613d7ad42d33108b83ae7c01 100644
--- a/execution/uc1-workload-generator/kustomization.yaml
+++ b/execution/uc1-workload-generator/kustomization.yaml
@@ -1,9 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app: titan-ccp-aggregation
-
 # Use all resources to compose them into one file
 resources:
   - deployment.yaml
diff --git a/execution/uc1-workload-generator/set_paramters.yaml b/execution/uc1-workload-generator/set_paramters.yaml
index 9d512893f4a22c9383dc81d73fe5ab71ea44d119..a63afa46fe0ecc4602ace583cc4fa0a7e4943366 100644
--- a/execution/uc1-workload-generator/set_paramters.yaml
+++ b/execution/uc1-workload-generator/set_paramters.yaml
@@ -10,6 +10,6 @@ spec:
       - name: workload-generator
         env:
         - name: NUM_SENSORS
-          value: 25000
+          value: "25000"
         - name: INSTANCES
-          value: 1
+          value: "1"
diff --git a/execution/uc2-workload-generator/kustomization.yaml b/execution/uc2-workload-generator/kustomization.yaml
index 17c5d2e1984ec7c76e60fcb27d7fb1a57e404405..faf86aa9aa2be42a613d7ad42d33108b83ae7c01 100644
--- a/execution/uc2-workload-generator/kustomization.yaml
+++ b/execution/uc2-workload-generator/kustomization.yaml
@@ -1,9 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app: titan-ccp-aggregation
-
 # Use all resources to compose them into one file
 resources:
   - deployment.yaml
diff --git a/execution/uc2-workload-generator/set_paramters.yaml b/execution/uc2-workload-generator/set_paramters.yaml
index 835568cc499c7e82ab53bb9a6638232e1155c1c5..d585eb437bff7673c061d88e10816b3068dc2143 100644
--- a/execution/uc2-workload-generator/set_paramters.yaml
+++ b/execution/uc2-workload-generator/set_paramters.yaml
@@ -10,4 +10,4 @@ spec:
       - name: workload-generator
         env:
         - name: NUM_NESTED_GROUPS
-          value: 25000
+          value: "25000"
diff --git a/execution/uc3-workload-generator/kustomization.yaml b/execution/uc3-workload-generator/kustomization.yaml
index 17c5d2e1984ec7c76e60fcb27d7fb1a57e404405..faf86aa9aa2be42a613d7ad42d33108b83ae7c01 100644
--- a/execution/uc3-workload-generator/kustomization.yaml
+++ b/execution/uc3-workload-generator/kustomization.yaml
@@ -1,9 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app: titan-ccp-aggregation
-
 # Use all resources to compose them into one file
 resources:
   - deployment.yaml
diff --git a/execution/uc3-workload-generator/set_paramters.yaml b/execution/uc3-workload-generator/set_paramters.yaml
index 9d512893f4a22c9383dc81d73fe5ab71ea44d119..a63afa46fe0ecc4602ace583cc4fa0a7e4943366 100644
--- a/execution/uc3-workload-generator/set_paramters.yaml
+++ b/execution/uc3-workload-generator/set_paramters.yaml
@@ -10,6 +10,6 @@ spec:
       - name: workload-generator
         env:
         - name: NUM_SENSORS
-          value: 25000
+          value: "25000"
         - name: INSTANCES
-          value: 1
+          value: "1"
diff --git a/execution/uc4-workload-generator/kustomization.yaml b/execution/uc4-workload-generator/kustomization.yaml
index 17c5d2e1984ec7c76e60fcb27d7fb1a57e404405..faf86aa9aa2be42a613d7ad42d33108b83ae7c01 100644
--- a/execution/uc4-workload-generator/kustomization.yaml
+++ b/execution/uc4-workload-generator/kustomization.yaml
@@ -1,9 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app: titan-ccp-aggregation
-
 # Use all resources to compose them into one file
 resources:
   - deployment.yaml
diff --git a/execution/uc4-workload-generator/set_paramters.yaml b/execution/uc4-workload-generator/set_paramters.yaml
index 1408043681d5bcb4c90f6ba011d0e18a4599cc4d..50ca424fbac14502ed51ed441d4a1787fc9b1063 100644
--- a/execution/uc4-workload-generator/set_paramters.yaml
+++ b/execution/uc4-workload-generator/set_paramters.yaml
@@ -10,4 +10,4 @@ spec:
       - name: workload-generator
         env:
         - name: NUM_SENSORS
-          value: 25000
+          value: "25000"