diff --git a/CITATION.cff b/CITATION.cff
index 04640de442f4458b09e11ce3d2939c850f594556..b6ca4542010b83e12206fbc0d9841683b43e1d57 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -8,7 +8,7 @@ authors:
     given-names: Wilhelm
     orcid: "https://orcid.org/0000-0001-6625-4335"
 title: Theodolite
-version: "0.6.3"
+version: "0.6.4"
 repository-code: "https://github.com/cau-se/theodolite"
 license: "Apache-2.0"
 doi: "10.1016/j.bdr.2021.100209"
diff --git a/codemeta.json b/codemeta.json
index 832b570681afb143978698fd47dad5d2835c700b..948a34628ec919e2492b61e3ac9997392dc5e030 100644
--- a/codemeta.json
+++ b/codemeta.json
@@ -8,7 +8,7 @@
     "dateModified": "2022-01-24",
     "downloadUrl": "https://github.com/cau-se/theodolite/releases",
     "name": "Theodolite",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "description": "Theodolite is a framework for benchmarking the horizontal and vertical scalability of cloud-native applications.",
     "developmentStatus": "active",
     "relatedLink": [
diff --git a/docs/index.yaml b/docs/index.yaml
index 3c33b277155c872fa230bcbb031770091a9643c2..dbf0ef00f5b96f57fb88bf0f73897b8f0f3a5826 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -1,6 +1,41 @@
 apiVersion: v1
 entries:
   theodolite:
+  - apiVersion: v2
+    appVersion: 0.6.4
+    created: "2022-02-16T15:28:04.313903981+01:00"
+    dependencies:
+    - condition: grafana.enabled
+      name: grafana
+      repository: https://grafana.github.io/helm-charts
+      version: 6.17.5
+    - condition: kube-prometheus-stack.enabled
+      name: kube-prometheus-stack
+      repository: https://prometheus-community.github.io/helm-charts
+      version: 20.0.1
+    - condition: cp-helm-charts.enabled
+      name: cp-helm-charts
+      repository: https://soerenhenning.github.io/cp-helm-charts
+      version: 0.6.0
+    - condition: kafka-lag-exporter.enabled
+      name: kafka-lag-exporter
+      repository: https://seanglover.com/kafka-lag-exporter/repo
+      version: 0.6.7
+    description: Theodolite is a framework for benchmarking the horizontal and vertical
+      scalability of cloud-native applications.
+    digest: b7554caf7295ae27ee0fe42b89903e7c02dd255816d1a1717e20f2fe0783427f
+    home: https://www.theodolite.rocks
+    maintainers:
+    - email: soeren.henning@email.uni-kiel.de
+      name: Sören Henning
+      url: https://www.se.informatik.uni-kiel.de/en/team/soeren-henning-m-sc
+    name: theodolite
+    sources:
+    - https://github.com/cau-se/theodolite
+    type: application
+    urls:
+    - https://github.com/cau-se/theodolite/releases/download/v0.6.4/theodolite-0.6.4.tgz
+    version: 0.6.4
   - apiVersion: v2
     appVersion: 0.6.3
     created: "2022-01-24T13:37:45.410029138+01:00"
@@ -246,4 +281,4 @@ entries:
     urls:
     - https://github.com/cau-se/theodolite/releases/download/v0.4.0/theodolite-0.4.0.tgz
     version: 0.4.0
-generated: "2022-01-24T13:37:45.371191415+01:00"
+generated: "2022-02-16T15:28:04.278282551+01:00"
diff --git a/execution/theodolite.yaml b/execution/theodolite.yaml
index 7025056b81cf09018866511507926d52c0617466..d09d09c50099bc0c8ad71373710f78347929f5e3 100644
--- a/execution/theodolite.yaml
+++ b/execution/theodolite.yaml
@@ -9,12 +9,12 @@ spec:
         runAsUser: 0 # Set the permissions for write access to the volumes.
       containers:
         - name: lag-analysis
-          image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend:v0.6.3
+          image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend:v0.6.4
           ports:
           - containerPort: 80
             name: analysis
         - name: theodolite
-          image: ghcr.io/cau-se/theodolite:v0.6.3
+          image: ghcr.io/cau-se/theodolite:v0.6.4
           imagePullPolicy: Always
           env:
             - name: NAMESPACE
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index a458480e9c3f18a180cad95e1b570167525d4a81..8536fa43c0bd6ce95488b9efe438ea6002be0a8f 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -29,6 +29,6 @@ dependencies:
     repository: https://seanglover.com/kafka-lag-exporter/repo
     condition: kafka-lag-exporter.enabled
 
-version: 0.6.3
+version: 0.6.4
 
-appVersion: 0.6.3
+appVersion: 0.6.4
diff --git a/helm/values.yaml b/helm/values.yaml
index 31bf0946e1d1b2e6e1539aa3a606e6bec0797960..87484c182f93549695b74baefb1237c44e629ca0 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -250,7 +250,7 @@ operator:
   enabled: true
   
   image: ghcr.io/cau-se/theodolite
-  imageTag: v0.6.3
+  imageTag: v0.6.4
   imagePullPolicy: IfNotPresent
 
   nodeSelector: {}
@@ -259,17 +259,17 @@ operator:
     generic:
       enabled: true
       image: ghcr.io/cau-se/theodolite-slo-checker-generic
-      imageTag: v0.6.3
+      imageTag: v0.6.4
       imagePullPolicy: IfNotPresent
     lagTrend:
       enabled: true
       image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend
-      imageTag: v0.6.3
+      imageTag: v0.6.4
       imagePullPolicy: IfNotPresent
     droppedRecordsKStreams:
       enabled: true
       image: ghcr.io/cau-se/theodolite-slo-checker-dropped-records-kstreams
-      imageTag: v0.6.3
+      imageTag: v0.6.4
       imagePullPolicy: IfNotPresent
 
   resultsVolume:
@@ -319,7 +319,7 @@ rbac:
 randomScheduler:
   enabled: true
   image: ghcr.io/cau-se/theodolite-random-scheduler
-  imageTag: v0.6.3
+  imageTag: v0.6.4
   imagePullPolicy: IfNotPresent
   rbac:
     create: true
diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
index 7b49a7a12875ad62e6e3c2cd69f9a3e0569a4cac..bab4b12d708fc02d8d8f20396d09972ce3b8b11d 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: jobmanager
-          image: ghcr.io/cau-se/theodolite-uc1-flink:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc1-flink:v0.6.4
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-cp-kafka:9092"
diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
index 632f5c7a7a91199a0594be8afc2fc4a2a6f55373..5d8e9e50990bc27d32e8004b5f70a460b32ec3bf 100644
--- a/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: taskmanager
-          image: ghcr.io/cau-se/theodolite-uc1-flink:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc1-flink:v0.6.4
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-cp-kafka:9092"
diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
index 94ccf5d99befb8a14bae3aeed2fa8dde742e3015..663a0425c780e17a47651690bd4b92963f671726 100644
--- a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc-application
-          image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:v0.6.4
           ports:
             - containerPort: 5555
               name: jmx
diff --git a/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml
index e0aebf7446f71a130be2a75a9d454fc297b77021..4ef1068297220a8ccce70bc0791f4b928e18106e 100644
--- a/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: workload-generator
-          image: ghcr.io/cau-se/theodolite-uc1-workload-generator:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc1-workload-generator:v0.6.4
           ports:
             - containerPort: 5701
               name: coordination
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
index 67d000bd1eb188c8bfdd8c5aac0e3c26f472d763..c596331d98486da1dc44409c623454440db89354 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: jobmanager
-          image: ghcr.io/cau-se/theodolite-uc2-flink:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc2-flink:v0.6.4
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-cp-kafka:9092"
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
index a5c3ebe5acb2715b82be95f165474bf3ac109e27..3fba3bcd9f11577f1f3a90a9ec662a6cbd0154d5 100644
--- a/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: taskmanager
-          image: ghcr.io/cau-se/theodolite-uc2-flink:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc2-flink:v0.6.4
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-cp-kafka:9092"
diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
index 64a48a69f9f772ee2d135c084455365d09179d27..1b04e5b52725f450ecc7a0e879b0407f01651e6b 100644
--- a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc-application
-          image: ghcr.io/cau-se/theodolite-uc2-kstreams-app:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc2-kstreams-app:v0.6.4
           ports:
             - containerPort: 5555
               name: jmx
diff --git a/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml
index fc9a23d26ba23bb4e0c5e105e0635ea8517bb022..875f191056d7c505d3b8a272c0558825b78aec79 100644
--- a/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: workload-generator
-          image: ghcr.io/cau-se/theodolite-uc2-workload-generator:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc2-workload-generator:v0.6.4
           ports:
             - containerPort: 5701
               name: coordination
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
index 7fa342214e930594db1b4b281ed765fbfadebd9f..d2c302fdbd673b20f3383296b2b6819b00d5b3a1 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: jobmanager
-          image: ghcr.io/cau-se/theodolite-uc3-flink:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc3-flink:v0.6.4
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-cp-kafka:9092"
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
index b5f1af8524c6538f5922ab9cca0d9a3f299810fa..72362db932180b6e925d775e22fa680230dcdc94 100644
--- a/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: taskmanager
-          image: ghcr.io/cau-se/theodolite-uc3-flink:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc3-flink:v0.6.4
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-cp-kafka:9092"
diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
index 95020cee52d8bf9ab6d0cc6751337a1229ece7f2..f7aa19beff7dd0364908df9a538924bc0bc652be 100644
--- a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc-application
-          image: ghcr.io/cau-se/theodolite-uc3-kstreams-app:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc3-kstreams-app:v0.6.4
           ports:
             - containerPort: 5555
               name: jmx
diff --git a/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml
index dfc2ba39275508bd74f86e35131d389a41bc6b6e..1aef5d67231a2403d2f33dcd3fa069e6998f28a9 100644
--- a/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: workload-generator
-          image: ghcr.io/cau-se/theodolite-uc3-workload-generator:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc3-workload-generator:v0.6.4
           ports:
             - containerPort: 5701
               name: coordination
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
index c1c62fd9ac864b7c03decb8d05a1bdefc83ab46f..eefd43091cf6497f997821cadd082e19da37fead 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: jobmanager
-          image: ghcr.io/cau-se/theodolite-uc4-flink:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc4-flink:v0.6.4
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-cp-kafka:9092"
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
index 15b173b90adafd91b8c47471b9e071f588d8ced8..4dae0e14383b6108f06632afcffbea36b9012dd3 100644
--- a/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: taskmanager
-          image: ghcr.io/cau-se/theodolite-uc4-flink:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc4-flink:v0.6.4
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-cp-kafka:9092"
diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
index 77f8e35e1dff6f6ef2d1d2c7ee3904975fccae1c..4ecd690f717b23225ad493d39d33a98fa4046061 100644
--- a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc-application
-          image: ghcr.io/cau-se/theodolite-uc4-kstreams-app:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc4-kstreams-app:v0.6.4
           ports:
             - containerPort: 5555
               name: jmx
diff --git a/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml
index 89e142461c83872fc568a8f947981174c499afb4..a30dd279a8049ce1750da0260a9771eddb6a0afe 100644
--- a/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: workload-generator
-          image: ghcr.io/cau-se/theodolite-uc4-workload-generator:v0.6.3
+          image: ghcr.io/cau-se/theodolite-uc4-workload-generator:v0.6.4
           ports:
             - containerPort: 5701
               name: coordination
diff --git a/theodolite-benchmarks/docker-test/uc1-flink-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-flink-docker-compose/docker-compose.yml
index 51d03bd89479c41be7dd787cdaa6295f14906ee9..dc33c3c106c705e3c8da83eaa82f478e28bc8c43 100755
--- a/theodolite-benchmarks/docker-test/uc1-flink-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-flink-docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:v0.6.4
     depends_on:
       - schema-registry
       - kafka
@@ -44,7 +44,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       NUM_SENSORS: 10
   benchmark-jobmanager:
-    image: ghcr.io/cau-se/theodolite-uc1-flink:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc1-flink:v0.6.4
     #ports:
     #  - "8080:8081"
     command: standalone-job --job-classname theodolite.uc1.application.HistoryServiceFlinkJob
@@ -59,7 +59,7 @@ services:
       - schema-registry
       - kafka
   benchmark-taskmanager:
-    image: ghcr.io/cau-se/theodolite-uc1-flink:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc1-flink:v0.6.4
     command: taskmanager
     environment:
       - |
diff --git a/theodolite-benchmarks/docker-test/uc1-kstreams-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-kstreams-docker-compose/docker-compose.yml
index 0afbc42b71be214f93d6c2f89f73c67f395139fc..b734e8e834c66d7ed4ccbde02ee78c4d51b2f08d 100755
--- a/theodolite-benchmarks/docker-test/uc1-kstreams-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-kstreams-docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:v0.6.4
     depends_on:
       - schema-registry
       - kafka
@@ -41,7 +41,7 @@ services:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:v0.6.4
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc2-flink-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-flink-docker-compose/docker-compose.yml
index 21c9018d11c8bfc3e279b05dbbae341c3f49c5b9..598e24a5af9af6e2496c0148be4ad397624c05bb 100755
--- a/theodolite-benchmarks/docker-test/uc2-flink-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-flink-docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:v0.6.4
     depends_on:
       - schema-registry
       - kafka
@@ -44,7 +44,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       NUM_SENSORS: 10  
   benchmark-jobmanager:
-    image: ghcr.io/cau-se/theodolite-uc2-flink:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc2-flink:v0.6.4
     #ports:
     #  - "8080:8081"
     command: standalone-job --job-classname theodolite.uc2.application.HistoryServiceFlinkJob
@@ -59,7 +59,7 @@ services:
       - schema-registry
       - kafka
   benchmark-taskmanager:
-    image: ghcr.io/cau-se/theodolite-uc2-flink:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc2-flink:v0.6.4
     command: taskmanager
     environment:
       - |
diff --git a/theodolite-benchmarks/docker-test/uc2-kstreams-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-kstreams-docker-compose/docker-compose.yml
index 7da6eedd066ac04cb6430a3d6e1a525bc6ebbe6f..637bf4cb7877caab61ca2baae51bc074175b3ca1 100755
--- a/theodolite-benchmarks/docker-test/uc2-kstreams-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-kstreams-docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc2-kstreams-app:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc2-kstreams-app:v0.6.4
     depends_on:
       - schema-registry
       - kafka
@@ -42,7 +42,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       KAFKA_WINDOW_DURATION_MINUTES: 60
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:v0.6.4
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc3-flink-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-flink-docker-compose/docker-compose.yml
index 0b03104867d74f7df9b2f78b0e81e76cb6ae2be6..2b08521b4f41e0da103784e2573d39f6d2332dcf 100755
--- a/theodolite-benchmarks/docker-test/uc3-flink-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-flink-docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:v0.6.4
     depends_on:
       - schema-registry
       - kafka
@@ -44,7 +44,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       NUM_SENSORS: 10
   benchmark-jobmanager:
-    image: ghcr.io/cau-se/theodolite-uc3-flink:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc3-flink:v0.6.4
     #ports:
     #  - "8080:8081"
     command: standalone-job --job-classname theodolite.uc3.application.HistoryServiceFlinkJob
@@ -59,7 +59,7 @@ services:
       - schema-registry
       - kafka
   benchmark-taskmanager:
-    image: ghcr.io/cau-se/theodolite-uc3-flink:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc3-flink:v0.6.4
     command: taskmanager
     environment:
       - |
diff --git a/theodolite-benchmarks/docker-test/uc3-kstreams-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-kstreams-docker-compose/docker-compose.yml
index d8da5085168bf4f801fcd16ff0cc8a8457ef5077..33594d4d0a017adff155e9cf7f72e1df43ef7a00 100755
--- a/theodolite-benchmarks/docker-test/uc3-kstreams-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-kstreams-docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc3-kstreams-app:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc3-kstreams-app:v0.6.4
     depends_on:
       - schema-registry
       - kafka
@@ -41,7 +41,7 @@ services:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:v0.6.4
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc4-flink-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-flink-docker-compose/docker-compose.yml
index 68fa054174178ee85dd66ffa71b9fa7a6d092058..77d9f7d883e1f84b0dac4c9bf78a48624597122e 100755
--- a/theodolite-benchmarks/docker-test/uc4-flink-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-flink-docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:v0.6.4
     depends_on:
       - schema-registry
       - kafka
@@ -45,7 +45,7 @@ services:
       NUM_SENSORS: 4
       NUM_NESTED_GROUPS: 4
   benchmark-jobmanager:
-    image: ghcr.io/cau-se/theodolite-uc4-flink:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc4-flink:v0.6.4
     #ports:
     #  - "8080:8081"
     command: standalone-job --job-classname theodolite.uc4.application.AggregationServiceFlinkJob
@@ -60,7 +60,7 @@ services:
       - schema-registry
       - kafka
   benchmark-taskmanager:
-    image: ghcr.io/cau-se/theodolite-uc4-flink:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc4-flink:v0.6.4
     command: taskmanager
     environment:
       - |
diff --git a/theodolite-benchmarks/docker-test/uc4-kstreams-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-kstreams-docker-compose/docker-compose.yml
index e6d1f732af665d026b1e0053e133695daf1f28e3..85eb514c2cd81f33e3bd966d3da3adc3b89b3e82 100755
--- a/theodolite-benchmarks/docker-test/uc4-kstreams-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-kstreams-docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc4-kstreams-app:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc4-kstreams-app:v0.6.4
     depends_on:
       - schema-registry
       - kafka
@@ -41,7 +41,7 @@ services:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:v0.6.3
+    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:v0.6.4
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite/README.md b/theodolite/README.md
index 21d614361d90edff86d226070803d731ead58232..3e5d1d249c4f3b43409eeabc85fbe54080f24af7 100644
--- a/theodolite/README.md
+++ b/theodolite/README.md
@@ -29,7 +29,7 @@ The application can be packaged using:
 ./gradlew build
 ```
 
-It produces the `theodolite-0.6.3-runner.jar` file in the `/build` directory. Be aware that it’s not
+It produces the `theodolite-0.6.4-runner.jar` file in the `/build` directory. Be aware that it’s not
 an _über-jar_ as the dependencies are copied into the `build/lib` directory.
 
 If you want to build an _über-jar_, execute the following command:
@@ -38,7 +38,7 @@ If you want to build an _über-jar_, execute the following command:
 ./gradlew build -Dquarkus.package.type=uber-jar
 ```
 
-The application is now runnable using `java -jar build/theodolite-0.6.3-runner.jar`.
+The application is now runnable using `java -jar build/theodolite-0.6.4-runner.jar`.
 
 ## Creating a native executable
 
@@ -57,7 +57,7 @@ Or, if you don't have GraalVM installed, you can run the native executable build
 ```
 
 You can then execute your native executable with:
-```./build/theodolite-0.6.3-runner```
+```./build/theodolite-0.6.4-runner```
 
 If you want to learn more about building native executables, please consult <https://quarkus.io/guides/gradle-tooling>.
 
diff --git a/theodolite/build.gradle b/theodolite/build.gradle
index 53b10d5b98ea237df3608efdec371454a2a306bb..e35bc1f0dbdf4b6c01fe6c7379f9943531d0e54d 100644
--- a/theodolite/build.gradle
+++ b/theodolite/build.gradle
@@ -36,7 +36,7 @@ dependencies {
 }
 
 group 'theodolite'
-version '0.6.3'
+version '0.6.4'
 
 java {
     sourceCompatibility = JavaVersion.VERSION_11