diff --git a/execution/run_uc1-new.sh b/execution/run_uc1-new.sh
index 83e540bc4a3bda52966942a7fca36f630494ff55..ee981554d60d42caedad8d5383af549b27d60504 100755
--- a/execution/run_uc1-new.sh
+++ b/execution/run_uc1-new.sh
@@ -42,15 +42,15 @@ 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 uc1-workload-generator
 
 # Start application
 REPLICAS=$INSTANCES
-cat <<EOF >uc1-application/set_paramters.yaml
+cat <<EOF >uc-application/overlay/uc1-application/set_paramters.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -59,17 +59,17 @@ spec:
   template:
     spec:
       containers:
-      - name: uc1-application
+      - name: uc-application
         env:
         - name: COMMIT_INTERVAL_MS
-          value: $KAFKA_STREAMS_COMMIT_INTERVAL_MS
+          value: "$KAFKA_STREAMS_COMMIT_INTERVAL_MS"
         resources:
           limits:
             memory: $MEMORY_LIMIT
             cpu: $CPU_LIMIT
 EOF
-kubectl apply -k uc1-application
-kubectl scale deployment titan-ccp-aggregation --replicas=$REPLICAS
+kubectl apply -k uc-application/overlay/uc1-application
+kubectl scale deployment uc1-titan-ccp-aggregation --replicas=$REPLICAS
 
 # Execute for certain time
 sleep ${EXECUTION_MINUTES}m
@@ -81,7 +81,7 @@ deactivate
 
 # Stop workload generator and app
 kubectl delete -k uc1-workload-generator
-kubectl delete -k uc1-application
+kubectl delete -k uc-application/overlay/uc1-application
 
 
 # Delete topics instead of Kafka
diff --git a/execution/run_uc2-new.sh b/execution/run_uc2-new.sh
index 42ce812b8d020f7d1322764c16d2593f138958c7..06dca8f32e1859a91f915fa438b1d36b670aaaa4 100755
--- a/execution/run_uc2-new.sh
+++ b/execution/run_uc2-new.sh
@@ -45,8 +45,7 @@ kubectl apply -k uc2-workload-generator
 
 # Start application
 REPLICAS=$INSTANCES
-# When not using `sed` anymore, use `kubectl apply -f uc2-application`
-cat <<EOF >uc2-application/set_paramters.yaml
+cat <<EOF >uc-application/overlay/uc1-application/set_paramters.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -55,17 +54,17 @@ spec:
   template:
     spec:
       containers:
-      - name: uc1-application
+      - name: uc-application
         env:
         - name: COMMIT_INTERVAL_MS
-          value: $KAFKA_STREAMS_COMMIT_INTERVAL_MS
+          value: "$KAFKA_STREAMS_COMMIT_INTERVAL_MS"
         resources:
           limits:
             memory: $MEMORY_LIMIT
             cpu: $CPU_LIMIT
 EOF
-kubectl apply -k uc2-application
-kubectl scale deployment titan-ccp-aggregation --replicas=$REPLICAS
+kubectl apply -k uc-application/overlay/uc2-application
+kubectl scale deployment uc2-titan-ccp-aggregation --replicas=$REPLICAS
 
 # Execute for certain time
 sleep ${EXECUTION_MINUTES}m
@@ -77,7 +76,7 @@ deactivate
 
 # Stop workload generator and app
 kubectl delete -k uc2-workload-generator
-kubectl delete -k uc2-application
+kubectl delete -k uc-application/overlay/uc2-application
 
 
 # Delete topics instead of Kafka
diff --git a/execution/run_uc3-new.sh b/execution/run_uc3-new.sh
index 9af96fbcb74fc68413f15e7cb1de39e5af58bcb0..2526791eafa0cf9d4465726b1dfe6ff449ac41f7 100755
--- a/execution/run_uc3-new.sh
+++ b/execution/run_uc3-new.sh
@@ -51,7 +51,7 @@ kubectl apply -k uc3-workload-generator
 
 # Start application
 REPLICAS=$INSTANCES
-cat <<EOF >uc3-application/set_paramters.yaml
+cat <<EOF >uc-application/overlay/uc3-application/set_paramters.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -60,17 +60,17 @@ spec:
   template:
     spec:
       containers:
-      - name: uc1-application
+      - name: uc-application
         env:
         - name: COMMIT_INTERVAL_MS
-          value: $KAFKA_STREAMS_COMMIT_INTERVAL_MS
+          value: "$KAFKA_STREAMS_COMMIT_INTERVAL_MS"
         resources:
           limits:
             memory: $MEMORY_LIMIT
             cpu: $CPU_LIMIT
 EOF
-kubectl apply -k uc3-application
-kubectl scale deployment titan-ccp-aggregation --replicas=$REPLICAS
+kubectl apply -k uc-application/overlay/uc3-application
+kubectl scale deployment uc3-titan-ccp-aggregation --replicas=$REPLICAS
 
 # Execute for certain time
 sleep ${EXECUTION_MINUTES}m
@@ -82,7 +82,7 @@ deactivate
 
 # Stop workload generator and app
 kubectl delete -k uc1-workload-generator
-kubectl delete -k uc1-application
+kubectl delete -k uc-application/overlay/uc3-application
 
 # Delete topics instead of Kafka
 #kubectl exec kafka-client -- bash -c "kafka-topics --zookeeper my-confluent-cp-zookeeper:2181 --delete --topic 'input,output,configuration,titan-.*'"
diff --git a/execution/run_uc4-new.sh b/execution/run_uc4-new.sh
index c22e49644403e1783bf5b498b4ae9d68239af2d2..76da28d9a4d169b156e4c9ec112c668f52e652a4 100755
--- a/execution/run_uc4-new.sh
+++ b/execution/run_uc4-new.sh
@@ -45,7 +45,7 @@ kubectl apply -k uc4-workload-generator
 
 # Start application
 REPLICAS=$INSTANCES
-cat <<EOF >uc1-application/set_paramters.yaml
+cat <<EOF >uc-application/overlay/uc1-application/set_paramters.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -54,17 +54,17 @@ spec:
   template:
     spec:
       containers:
-      - name: uc1-application
+      - name: uc-application
         env:
         - name: COMMIT_INTERVAL_MS
-          value: $KAFKA_STREAMS_COMMIT_INTERVAL_MS
+          value: "$KAFKA_STREAMS_COMMIT_INTERVAL_MS"
         resources:
           limits:
             memory: $MEMORY_LIMIT
             cpu: $CPU_LIMIT
 EOF
-kubectl apply -k uc4-application
-kubectl scale deployment titan-ccp-aggregation --replicas=$REPLICAS
+kubectl apply -k uc-application/overlay/uc4-application
+kubectl scale deployment uc4-titan-ccp-aggregation --replicas=$REPLICAS
 
 # Execute for certain time
 sleep ${EXECUTION_MINUTES}m
@@ -76,7 +76,7 @@ deactivate
 
 # Stop workload generator and app
 kubectl delete -k uc4-workload-generator
-kubectl delete -k uc4-application
+kubectl delete -k uc-application/overlay/uc4-application
 
 
 # Delete topics instead of Kafka
diff --git a/execution/uc1-application/aggregation-deployment.yaml b/execution/uc-application/base/aggregation-deployment.yaml
similarity index 95%
rename from execution/uc1-application/aggregation-deployment.yaml
rename to execution/uc-application/base/aggregation-deployment.yaml
index 5232e83b820e73dd9634032a03c884bae3c8de94..129a9be642acec649b5eb6e1354e2d6c56747947 100644
--- a/execution/uc1-application/aggregation-deployment.yaml
+++ b/execution/uc-application/base/aggregation-deployment.yaml
@@ -14,8 +14,8 @@ spec:
     spec:
       terminationGracePeriodSeconds: 0
       containers:
-      - name: uc1-application
-        image: "soerenhenning/uc1-app:latest"
+      - name: uc-application
+        image: "uc-app:latest"
         ports:
         - containerPort: 5555
           name: jmx
diff --git a/execution/uc1-application/aggregation-service.yaml b/execution/uc-application/base/aggregation-service.yaml
similarity index 100%
rename from execution/uc1-application/aggregation-service.yaml
rename to execution/uc-application/base/aggregation-service.yaml
diff --git a/execution/uc1-application/jmx-configmap.yaml b/execution/uc-application/base/jmx-configmap.yaml
similarity index 100%
rename from execution/uc1-application/jmx-configmap.yaml
rename to execution/uc-application/base/jmx-configmap.yaml
diff --git a/execution/uc2-application/kustomization.yaml b/execution/uc-application/base/kustomization.yaml
similarity index 76%
rename from execution/uc2-application/kustomization.yaml
rename to execution/uc-application/base/kustomization.yaml
index ab5c91fbce6fbcc12001e76206cf8d483a1a0875..24c89cfdafb17cdc91f65198b9faf3665bfc6822 100644
--- a/execution/uc2-application/kustomization.yaml
+++ b/execution/uc-application/base/kustomization.yaml
@@ -10,6 +10,3 @@ resources:
   - aggregation-service.yaml
   - service-monitor.yaml
   - jmx-configmap.yaml
-
-patchesStrategicMerge:
-- set_paramters.yaml # Patch setting the resource parameters
diff --git a/execution/uc1-application/service-monitor.yaml b/execution/uc-application/base/service-monitor.yaml
similarity index 100%
rename from execution/uc1-application/service-monitor.yaml
rename to execution/uc-application/base/service-monitor.yaml
diff --git a/execution/uc-application/overlay/uc1-application/kustomization.yaml b/execution/uc-application/overlay/uc1-application/kustomization.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5dc746cc26ab31e96f925717b2145a3e3b89aee3
--- /dev/null
+++ b/execution/uc-application/overlay/uc1-application/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namePrefix: uc1-
+
+images:
+  - name: uc-app
+    newName: soerenhenning/uc1-app
+    newTag: latest
+
+bases:
+- ../../base
+
+patchesStrategicMerge:
+- set_paramters.yaml # Patch setting the resource parameters
diff --git a/execution/uc2-application/set_paramters.yaml b/execution/uc-application/overlay/uc1-application/set_paramters.yaml
similarity index 83%
rename from execution/uc2-application/set_paramters.yaml
rename to execution/uc-application/overlay/uc1-application/set_paramters.yaml
index cee53281f960c682b663eeae5e41e9c66c2e9e98..57611fabd1a89a8655ce03b9cb8a059e1f695e77 100644
--- a/execution/uc2-application/set_paramters.yaml
+++ b/execution/uc-application/overlay/uc1-application/set_paramters.yaml
@@ -6,10 +6,10 @@ spec:
   template:
     spec:
       containers:
-      - name: uc2-application
+      - name: uc-application
         env:
         - name: COMMIT_INTERVAL_MS
-          value: 100
+          value: "100"
         resources:
           limits:
             memory: 4Gi
diff --git a/execution/uc-application/overlay/uc2-application/kustomization.yaml b/execution/uc-application/overlay/uc2-application/kustomization.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8c62daebd716c79451ce065c3e9d73bc96e8ff25
--- /dev/null
+++ b/execution/uc-application/overlay/uc2-application/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namePrefix: uc2-
+
+images:
+  - name: uc-app
+    newName: soerenhenning/uc2-app
+    newTag: latest
+
+bases:
+- ../../base
+
+patchesStrategicMerge:
+- set_paramters.yaml # Patch setting the resource parameters
diff --git a/execution/uc1-application/set_paramters.yaml b/execution/uc-application/overlay/uc2-application/set_paramters.yaml
similarity index 83%
rename from execution/uc1-application/set_paramters.yaml
rename to execution/uc-application/overlay/uc2-application/set_paramters.yaml
index af64785a6e04acd091105c63c1895af8a3b6fa41..57611fabd1a89a8655ce03b9cb8a059e1f695e77 100644
--- a/execution/uc1-application/set_paramters.yaml
+++ b/execution/uc-application/overlay/uc2-application/set_paramters.yaml
@@ -6,10 +6,10 @@ spec:
   template:
     spec:
       containers:
-      - name: uc1-application
+      - name: uc-application
         env:
         - name: COMMIT_INTERVAL_MS
-          value: 100
+          value: "100"
         resources:
           limits:
             memory: 4Gi
diff --git a/execution/uc-application/overlay/uc3-application/kustomization.yaml b/execution/uc-application/overlay/uc3-application/kustomization.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0a898a9ca0ecd98e1ea411ce9997aed020351428
--- /dev/null
+++ b/execution/uc-application/overlay/uc3-application/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namePrefix: uc3-
+
+images:
+  - name: uc-app
+    newName: soerenhenning/uc3-app
+    newTag: latest
+
+bases:
+- ../../base
+
+patchesStrategicMerge:
+- set_paramters.yaml # Patch setting the resource parameters
diff --git a/execution/uc3-application/set_paramters.yaml b/execution/uc-application/overlay/uc3-application/set_paramters.yaml
similarity index 90%
rename from execution/uc3-application/set_paramters.yaml
rename to execution/uc-application/overlay/uc3-application/set_paramters.yaml
index 2738e0c17006d7005220fb6825be62f866f99872..d25865a7f39e29aaa3f6f22d19b682cc78179de0 100644
--- a/execution/uc3-application/set_paramters.yaml
+++ b/execution/uc-application/overlay/uc3-application/set_paramters.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     spec:
       containers:
-      - name: uc3-application
+      - name: uc-application
         env:
         - name: COMMIT_INTERVAL_MS
           value: 100
diff --git a/execution/uc-application/overlay/uc4-application/kustomization.yaml b/execution/uc-application/overlay/uc4-application/kustomization.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..00ad540e66b0ccfd1f4322c6f04951faf344b3bd
--- /dev/null
+++ b/execution/uc-application/overlay/uc4-application/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namePrefix: uc4-
+
+images:
+  - name: uc-app
+    newName: soerenhenning/uc4-app
+    newTag: latest
+
+bases:
+- ../../base
+
+patchesStrategicMerge:
+- set_paramters.yaml # Patch setting the resource parameters
diff --git a/execution/uc4-application/set_paramters.yaml b/execution/uc-application/overlay/uc4-application/set_paramters.yaml
similarity index 83%
rename from execution/uc4-application/set_paramters.yaml
rename to execution/uc-application/overlay/uc4-application/set_paramters.yaml
index 38c80d9ff6634e700d4808fc127be3707fd2c41d..57611fabd1a89a8655ce03b9cb8a059e1f695e77 100644
--- a/execution/uc4-application/set_paramters.yaml
+++ b/execution/uc-application/overlay/uc4-application/set_paramters.yaml
@@ -6,10 +6,10 @@ spec:
   template:
     spec:
       containers:
-      - name: uc4-application
+      - name: uc-application
         env:
         - name: COMMIT_INTERVAL_MS
-          value: 100
+          value: "100"
         resources:
           limits:
             memory: 4Gi
diff --git a/execution/uc1-application/kustomization.yaml b/execution/uc1-application/kustomization.yaml
deleted file mode 100644
index ab5c91fbce6fbcc12001e76206cf8d483a1a0875..0000000000000000000000000000000000000000
--- a/execution/uc1-application/kustomization.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-commonLabels:
-  app: titan-ccp-aggregation
-
-# Use all resources to compose them into one file
-resources:
-  - aggregation-deployment.yaml
-  - aggregation-service.yaml
-  - service-monitor.yaml
-  - jmx-configmap.yaml
-
-patchesStrategicMerge:
-- set_paramters.yaml # Patch setting the resource parameters
diff --git a/execution/uc2-application/aggregation-deployment.yaml b/execution/uc2-application/aggregation-deployment.yaml
deleted file mode 100644
index a0f8b4354695ea554d5e88fa72b137e0b336de10..0000000000000000000000000000000000000000
--- a/execution/uc2-application/aggregation-deployment.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: titan-ccp-aggregation
-spec:
-  selector:
-    matchLabels:
-      app: titan-ccp-aggregation
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: titan-ccp-aggregation
-    spec:
-      terminationGracePeriodSeconds: 0
-      containers:
-      - name: uc2-application
-        image: "benediktwetzel/uc2-app:latest"
-        ports:
-        - containerPort: 5555
-          name: jmx
-        env:
-        - name: KAFKA_BOOTSTRAP_SERVERS
-          value: "my-confluent-cp-kafka:9092"
-        - name: COMMIT_INTERVAL_MS
-          value: 100
-        - name: JAVA_OPTS
-          value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-        resources:
-          limits:
-            memory: 4Gi
-            cpu: 1000m
-      - name: prometheus-jmx-exporter
-        image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-        command:
-          - java
-          - -XX:+UnlockExperimentalVMOptions
-          - -XX:+UseCGroupMemoryLimitForHeap
-          - -XX:MaxRAMFraction=1
-          - -XshowSettings:vm
-          - -jar
-          - jmx_prometheus_httpserver.jar
-          - "5556"
-          - /etc/jmx-aggregation/jmx-kafka-prometheus.yml
-        ports:
-          - containerPort: 5556
-        volumeMounts:
-          - name: jmx-config
-            mountPath: /etc/jmx-aggregation
-      volumes:
-        - name: jmx-config
-          configMap:
-            name: aggregation-jmx-configmap
diff --git a/execution/uc2-application/aggregation-service.yaml b/execution/uc2-application/aggregation-service.yaml
deleted file mode 100644
index 85432d04f225c30469f3232153ef6bd72bd02bdf..0000000000000000000000000000000000000000
--- a/execution/uc2-application/aggregation-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:  
-  name: titan-ccp-aggregation
-  labels:
-    app: titan-ccp-aggregation
-spec:
-  #type: NodePort
-  selector:    
-    app: titan-ccp-aggregation
-  ports:  
-  - name: http
-    port: 80
-    targetPort: 80
-    protocol: TCP
-  - name: metrics
-    port: 5556
diff --git a/execution/uc2-application/jmx-configmap.yaml b/execution/uc2-application/jmx-configmap.yaml
deleted file mode 100644
index 78496a86b1242a89b9e844ead3e700fd0b9a9667..0000000000000000000000000000000000000000
--- a/execution/uc2-application/jmx-configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: aggregation-jmx-configmap
-data:
-  jmx-kafka-prometheus.yml: |+
-    jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:5555/jmxrmi
-    lowercaseOutputName: true
-    lowercaseOutputLabelNames: true
-    ssl: false
diff --git a/execution/uc2-application/service-monitor.yaml b/execution/uc2-application/service-monitor.yaml
deleted file mode 100644
index 4e7e758cacb5086305efa26292ddef2afc958096..0000000000000000000000000000000000000000
--- a/execution/uc2-application/service-monitor.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app: titan-ccp-aggregation
-    appScope: titan-ccp
-  name: titan-ccp-aggregation
-spec:
-  selector:
-    matchLabels:
-        app: titan-ccp-aggregation
-  endpoints:
-    - port: metrics
-      interval: 10s
diff --git a/execution/uc3-application/aggregation-deployment.yaml b/execution/uc3-application/aggregation-deployment.yaml
deleted file mode 100644
index 23d77086a4c1d9ee1fbd3c45616a9bf47857aef7..0000000000000000000000000000000000000000
--- a/execution/uc3-application/aggregation-deployment.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: titan-ccp-aggregation
-spec:
-  selector:
-    matchLabels:
-      app: titan-ccp-aggregation
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: titan-ccp-aggregation
-    spec:
-      terminationGracePeriodSeconds: 0
-      containers:
-      - name: uc3-application
-        image: "soerenhenning/uc3-app:latest"
-        ports:
-        - containerPort: 5555
-          name: jmx
-        env:
-        - name: KAFKA_BOOTSTRAP_SERVERS
-          value: "my-confluent-cp-kafka:9092"
-        - name: KAFKA_WINDOW_DURATION_MINUTES
-          value: "1"
-        - name: COMMIT_INTERVAL_MS
-          value: 100
-        - name: JAVA_OPTS
-          value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-        resources:
-          limits:
-            memory: 4Gi
-            cpu: 1000m
-      - name: prometheus-jmx-exporter
-        image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-        command:
-          - java
-          - -XX:+UnlockExperimentalVMOptions
-          - -XX:+UseCGroupMemoryLimitForHeap
-          - -XX:MaxRAMFraction=1
-          - -XshowSettings:vm
-          - -jar
-          - jmx_prometheus_httpserver.jar
-          - "5556"
-          - /etc/jmx-aggregation/jmx-kafka-prometheus.yml
-        ports:
-          - containerPort: 5556
-        volumeMounts:
-          - name: jmx-config
-            mountPath: /etc/jmx-aggregation
-      volumes:
-        - name: jmx-config
-          configMap:
-            name: aggregation-jmx-configmap
diff --git a/execution/uc3-application/aggregation-service.yaml b/execution/uc3-application/aggregation-service.yaml
deleted file mode 100644
index 85432d04f225c30469f3232153ef6bd72bd02bdf..0000000000000000000000000000000000000000
--- a/execution/uc3-application/aggregation-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:  
-  name: titan-ccp-aggregation
-  labels:
-    app: titan-ccp-aggregation
-spec:
-  #type: NodePort
-  selector:    
-    app: titan-ccp-aggregation
-  ports:  
-  - name: http
-    port: 80
-    targetPort: 80
-    protocol: TCP
-  - name: metrics
-    port: 5556
diff --git a/execution/uc3-application/jmx-configmap.yaml b/execution/uc3-application/jmx-configmap.yaml
deleted file mode 100644
index 78496a86b1242a89b9e844ead3e700fd0b9a9667..0000000000000000000000000000000000000000
--- a/execution/uc3-application/jmx-configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: aggregation-jmx-configmap
-data:
-  jmx-kafka-prometheus.yml: |+
-    jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:5555/jmxrmi
-    lowercaseOutputName: true
-    lowercaseOutputLabelNames: true
-    ssl: false
diff --git a/execution/uc3-application/kustomization.yaml b/execution/uc3-application/kustomization.yaml
deleted file mode 100644
index ab5c91fbce6fbcc12001e76206cf8d483a1a0875..0000000000000000000000000000000000000000
--- a/execution/uc3-application/kustomization.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-commonLabels:
-  app: titan-ccp-aggregation
-
-# Use all resources to compose them into one file
-resources:
-  - aggregation-deployment.yaml
-  - aggregation-service.yaml
-  - service-monitor.yaml
-  - jmx-configmap.yaml
-
-patchesStrategicMerge:
-- set_paramters.yaml # Patch setting the resource parameters
diff --git a/execution/uc3-application/service-monitor.yaml b/execution/uc3-application/service-monitor.yaml
deleted file mode 100644
index 4e7e758cacb5086305efa26292ddef2afc958096..0000000000000000000000000000000000000000
--- a/execution/uc3-application/service-monitor.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app: titan-ccp-aggregation
-    appScope: titan-ccp
-  name: titan-ccp-aggregation
-spec:
-  selector:
-    matchLabels:
-        app: titan-ccp-aggregation
-  endpoints:
-    - port: metrics
-      interval: 10s
diff --git a/execution/uc4-application/aggregation-deployment.yaml b/execution/uc4-application/aggregation-deployment.yaml
deleted file mode 100644
index be0718266fadaa90dc2c7aa922296bbc1e63252a..0000000000000000000000000000000000000000
--- a/execution/uc4-application/aggregation-deployment.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: titan-ccp-aggregation
-spec:
-  selector:
-    matchLabels:
-      app: titan-ccp-aggregation
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: titan-ccp-aggregation
-    spec:
-      terminationGracePeriodSeconds: 0
-      containers:
-      - name: uc4-application
-        image: "soerenhenning/uc4-app:latest"
-        ports:
-        - containerPort: 5555
-          name: jmx
-        env:
-        - name: KAFKA_BOOTSTRAP_SERVERS
-          value: "my-confluent-cp-kafka:9092"
-        - name: AGGREGATION_DURATION_DAYS
-          value: "3" #AGGREGATION_DURATION_DAYS
-        - name: AGGREGATION_DURATION_ADVANCE
-          value: "1"
-        - name: COMMIT_INTERVAL_MS
-          value: 100
-        - name: JAVA_OPTS
-          value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
-        resources:
-          limits:
-            memory: 4Gi
-            cpu: 1000m
-      - name: prometheus-jmx-exporter
-        image: "solsson/kafka-prometheus-jmx-exporter@sha256:6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143"
-        command:
-          - java
-          - -XX:+UnlockExperimentalVMOptions
-          - -XX:+UseCGroupMemoryLimitForHeap
-          - -XX:MaxRAMFraction=1
-          - -XshowSettings:vm
-          - -jar
-          - jmx_prometheus_httpserver.jar
-          - "5556"
-          - /etc/jmx-aggregation/jmx-kafka-prometheus.yml
-        ports:
-          - containerPort: 5556
-        volumeMounts:
-          - name: jmx-config
-            mountPath: /etc/jmx-aggregation
-      volumes:
-        - name: jmx-config
-          configMap:
-            name: aggregation-jmx-configmap
diff --git a/execution/uc4-application/aggregation-service.yaml b/execution/uc4-application/aggregation-service.yaml
deleted file mode 100644
index 85432d04f225c30469f3232153ef6bd72bd02bdf..0000000000000000000000000000000000000000
--- a/execution/uc4-application/aggregation-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:  
-  name: titan-ccp-aggregation
-  labels:
-    app: titan-ccp-aggregation
-spec:
-  #type: NodePort
-  selector:    
-    app: titan-ccp-aggregation
-  ports:  
-  - name: http
-    port: 80
-    targetPort: 80
-    protocol: TCP
-  - name: metrics
-    port: 5556
diff --git a/execution/uc4-application/jmx-configmap.yaml b/execution/uc4-application/jmx-configmap.yaml
deleted file mode 100644
index 78496a86b1242a89b9e844ead3e700fd0b9a9667..0000000000000000000000000000000000000000
--- a/execution/uc4-application/jmx-configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: aggregation-jmx-configmap
-data:
-  jmx-kafka-prometheus.yml: |+
-    jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:5555/jmxrmi
-    lowercaseOutputName: true
-    lowercaseOutputLabelNames: true
-    ssl: false
diff --git a/execution/uc4-application/kustomization.yaml b/execution/uc4-application/kustomization.yaml
deleted file mode 100644
index ab5c91fbce6fbcc12001e76206cf8d483a1a0875..0000000000000000000000000000000000000000
--- a/execution/uc4-application/kustomization.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-commonLabels:
-  app: titan-ccp-aggregation
-
-# Use all resources to compose them into one file
-resources:
-  - aggregation-deployment.yaml
-  - aggregation-service.yaml
-  - service-monitor.yaml
-  - jmx-configmap.yaml
-
-patchesStrategicMerge:
-- set_paramters.yaml # Patch setting the resource parameters
diff --git a/execution/uc4-application/service-monitor.yaml b/execution/uc4-application/service-monitor.yaml
deleted file mode 100644
index 4e7e758cacb5086305efa26292ddef2afc958096..0000000000000000000000000000000000000000
--- a/execution/uc4-application/service-monitor.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app: titan-ccp-aggregation
-    appScope: titan-ccp
-  name: titan-ccp-aggregation
-spec:
-  selector:
-    matchLabels:
-        app: titan-ccp-aggregation
-  endpoints:
-    - port: metrics
-      interval: 10s