diff --git a/CITATION.cff b/CITATION.cff
index a67d18092049d040d79b75216d9dee7099f9993f..1ea7e1e8a7010ca0a012746b82015ce4bb9da5d4 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.8.4"
+version: "0.8.5"
 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 29a73dfaf96f50eba218648d23ccfde735887894..95b55852badbf0c51cbed23b3a9cfe766188c792 100644
--- a/codemeta.json
+++ b/codemeta.json
@@ -5,10 +5,10 @@
     "codeRepository": "https://github.com/cau-se/theodolite",
     "dateCreated": "2020-03-13",
     "datePublished": "2020-07-27",
-    "dateModified": "2023-02-01",
+    "dateModified": "2023-02-09",
     "downloadUrl": "https://github.com/cau-se/theodolite/releases",
     "name": "Theodolite",
-    "version": "0.8.4",
+    "version": "0.8.5",
     "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 41b297b25b1e55a68034a04241c3f35c98c84400..fe31fb71ab11996dad822a519d410590b5626a10 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -1,6 +1,42 @@
 apiVersion: v1
 entries:
   theodolite:
+  - apiVersion: v2
+    appVersion: 0.8.5
+    created: "2023-02-09T12:32:20.39740723+01:00"
+    dependencies:
+    - condition: grafana.enabled
+      name: grafana
+      repository: https://grafana.github.io/helm-charts
+      version: 6.17.*
+    - condition: kube-prometheus-stack.enabled
+      name: kube-prometheus-stack
+      repository: https://prometheus-community.github.io/helm-charts
+      version: 41.7.*
+    - condition: cp-helm-charts.enabled
+      name: cp-helm-charts
+      repository: https://soerenhenning.github.io/cp-helm-charts
+      version: 0.6.0
+    - condition: strimzi.enabled
+      name: strimzi-kafka-operator
+      repository: https://strimzi.io/charts/
+      version: 0.29.*
+    description: Theodolite is a framework for benchmarking the horizontal and vertical
+      scalability of cloud-native applications.
+    digest: 6b80c894c6db461a65262553d5dbe8880c4d22edebd150b9a97819a7e3355509
+    home: https://www.theodolite.rocks
+    icon: https://www.theodolite.rocks/assets/logo/theodolite-stacked-transparent.svg
+    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.8.5/theodolite-0.8.5.tgz
+    version: 0.8.5
   - apiVersion: v2
     appVersion: 0.8.4
     created: "2023-02-01T13:58:37.21272004+01:00"
@@ -531,4 +567,4 @@ entries:
     urls:
     - https://github.com/cau-se/theodolite/releases/download/v0.4.0/theodolite-0.4.0.tgz
     version: 0.4.0
-generated: "2023-02-01T13:58:37.167548872+01:00"
+generated: "2023-02-09T12:32:20.352845798+01:00"
diff --git a/execution/theodolite.yaml b/execution/theodolite.yaml
index 819b533f9ff1bee3236f9669c67974f6b44f49ba..4006ea4fa48e8a927c1020a1256aa22793157aba 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.8.4
+          image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend:v0.8.5
           ports:
           - containerPort: 80
             name: analysis
         - name: theodolite
-          image: ghcr.io/cau-se/theodolite:v0.8.4
+          image: ghcr.io/cau-se/theodolite:v0.8.5
           imagePullPolicy: Always
           env:
             - name: NAMESPACE
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index b438c374c5150eddaeba7ba657c5044a55f838ae..832f067f248149440dd083dd2967d9bce3ea73b5 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -31,6 +31,6 @@ dependencies:
     condition: strimzi.enabled
 
 
-version: 0.8.4
+version: 0.8.5
 
-appVersion: 0.8.4
+appVersion: 0.8.5
diff --git a/helm/values.yaml b/helm/values.yaml
index d1822c64c4f80c0ba0f1d1f836746957a0b4d4a3..b8b933d9977f6272ebad0bbb6f9c738c0d8cb49f 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -306,7 +306,7 @@ operator:
   enabled: true
   
   image: ghcr.io/cau-se/theodolite
-  imageTag: v0.8.4
+  imageTag: v0.8.5
   imagePullPolicy: IfNotPresent
 
   nodeSelector: {}
@@ -315,17 +315,17 @@ operator:
     generic:
       enabled: true
       image: ghcr.io/cau-se/theodolite-slo-checker-generic
-      imageTag: v0.8.4
+      imageTag: v0.8.5
       imagePullPolicy: IfNotPresent
     lagTrend:
       enabled: true
       image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend
-      imageTag: v0.8.4
+      imageTag: v0.8.5
       imagePullPolicy: IfNotPresent
     droppedRecordsKStreams:
       enabled: false
       image: ghcr.io/cau-se/theodolite-slo-checker-dropped-records-kstreams
-      imageTag: v0.8.4
+      imageTag: v0.8.5
       imagePullPolicy: IfNotPresent
 
   resultsVolume:
@@ -392,7 +392,7 @@ rbac:
 randomScheduler:
   enabled: false
   image: ghcr.io/cau-se/theodolite-random-scheduler
-  imageTag: v0.8.4
+  imageTag: v0.8.5
   imagePullPolicy: IfNotPresent
   rbac:
     create: true
diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml
index 7dcdbbf4b3632aaa56394b5d69c6692a2b6bef80..428f5ee5be29cdba7ce5da07ea37168d1a6e38dd 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: jobmanager
-          image: ghcr.io/cau-se/theodolite-uc1-beam-flink:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc1-beam-flink:v0.8.5
           args: ["standalone-job", "--job-classname", "rocks.theodolite.benchmarks.uc1.beam.flink.Uc1BeamFlink",
                   "--parallelism=$(PARALLELISM)",
                   "--disableMetrics=true",
diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml
index 32dcbcf42ada6d39f7c5822b616f58587fab9104..9bd1a7f6d266631eae79a1e34ac4b90328a68722 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: taskmanager
-          image: ghcr.io/cau-se/theodolite-uc1-beam-flink:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc1-beam-flink:v0.8.5
           args: ["taskmanager"]
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
index ebc5644865c0e46c92af954fc25d27c9de96255f..0fc656e88af48b38583f6572cb91ec2dec4cd391 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc1-beam-samza
-          image: ghcr.io/cau-se/theodolite-uc1-beam-samza:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc1-beam-samza:v0.8.5
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
               value: "theodolite-kafka-zoo-entrance:2181"
diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml
index 1e2e39afba13a83a110e62848920a7390c2ec450..6d729502235b02e1d7caa3a22fd0649aed178fdf 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc1-flink:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml
index dcc964297dbd3218dbe42a1313d1e7802a003727..1a19f4f42c513910e3cd4d7fd12a1b658150e7e1 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc1-flink:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
diff --git a/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml
index 117c51c60039e2888cc42de91c110fa215529823..50dd2f65ac9661e608af5e014e15e8aac9a975f7 100644
--- a/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-hazelcastjet/resources/uc1-hazelcastjet-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc-application
-          image: ghcr.io/cau-se/theodolite-uc1-hazelcastjet:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc1-hazelcastjet:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap: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 09569ea35ec4b3dc122617f2e267be2e6d63133b..b7052dfd076bebbf7d5b6ca3536eb6b0301e41a3 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:v0.8.5
           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 90f7ea3fc2900d5de3027e8b0f85051c1e58ef65..6004c96c4b23e32630ad7d5313a32b08fe87b0ce 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc1-workload-generator:v0.8.5
           ports:
             - containerPort: 5701
               name: coordination
diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml
index 7e65b2add91c07df204dcedbacf9ba8d716e35bb..d5b01344956c352ad7038e7dcf3a1ae6d50923e2 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: jobmanager
-          image: ghcr.io/cau-se/theodolite-uc2-beam-flink:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc2-beam-flink:v0.8.5
           args: ["standalone-job", "--job-classname", "rocks.theodolite.benchmarks.uc2.beam.flink.Uc2BeamFlink",
                   "--parallelism=$(PARALLELISM)",
                   "--disableMetrics=true",
diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml
index b20783444b5c16e791fd32ed340a335bb46657ca..a7b149f1924b3c5c88be05fd86522b389f3f4586 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: taskmanager
-          image: ghcr.io/cau-se/theodolite-uc2-beam-flink:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc2-beam-flink:v0.8.5
           args: ["taskmanager"]
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
index c9686a8e6c5da707a479db6eb019943f7d24685d..615bd4084666c51e0574bebcddd20d33436d0f77 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc2-beam-samza
-          image: ghcr.io/cau-se/theodolite-uc2-beam-samza:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc2-beam-samza:v0.8.5
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
               value: "theodolite-kafka-zoo-entrance:2181"
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml
index 2dd19d05c096ad340ac838468c50da215377bfe6..1b49051d1c5ded2f25cf6c9bf9317036958622c5 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc2-flink:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml
index be2683e86f79c6a376bb4b72bd87be3b7c19335a..18d365cc1f61cebdc0145cbe932109bf80066979 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc2-flink:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml
index 0f346108e4e4280237ff01d4bfe5f616699b73d2..9ba3b6960cea2fe507efc489e167a0ad5945c5c6 100644
--- a/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-hazelcastjet/resources/uc2-hazelcastjet-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc-application
-          image: ghcr.io/cau-se/theodolite-uc2-hazelcastjet:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc2-hazelcastjet:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap: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 e01a787c534530a0ec4681fdb66d48062a1609f3..880ac8bc6cc9a0dae99cdb77785cea758250dd2e 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc2-kstreams-app:v0.8.5
           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 38bc9370f840931a7b1dff1d029b68338965409b..7b74bd06fe982f029dcdb77936fa934585f03d8b 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc2-workload-generator:v0.8.5
           ports:
             - containerPort: 5701
               name: coordination
diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml
index 07879eb9994d77e4386f01ddeb6980ac707d7a98..8d2d7157f6eaaf718f48c673d057af78a3ad93f5 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: jobmanager
-          image: ghcr.io/cau-se/theodolite-uc3-beam-flink:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc3-beam-flink:v0.8.5
           args: ["standalone-job", "--job-classname", "rocks.theodolite.benchmarks.uc3.beam.flink.Uc3BeamFlink",
                   "--parallelism=$(PARALLELISM)",
                   "--disableMetrics=true",
diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml
index c987af55715652919957832c20baaa1281722285..c986fe53664944baaa481c43c49c60c3eff9412d 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: taskmanager
-          image: ghcr.io/cau-se/theodolite-uc3-beam-flink:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc3-beam-flink:v0.8.5
           args: ["taskmanager"]
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
index bcccb242d3e44c9ebfe6bf942f1db0a5f3aa7edb..4db3b1940b9782300bab055f7177add1a56cfafe 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc3-beam-samza
-          image: ghcr.io/cau-se/theodolite-uc3-beam-samza:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc3-beam-samza:v0.8.5
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
               value: "theodolite-kafka-zoo-entrance:2181"
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml
index e90f466938a24a78c0e0c9deeb3f968de16f7e6b..8a1981c9c02fb7f785abfb48acdc44c002f2f030 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc3-flink:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml
index 59667f033df14f21e2591e09197b6ca18f3fe857..8f8075727ef2dc07623bfbc324769fbb02ac2798 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc3-flink:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
diff --git a/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml
index 96729ee669720854c135588bbea7404f92196c4c..0e51e50af7c13239de3d597f1b398d78aa880561 100644
--- a/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-hazelcastjet/resources/uc3-hazelcastjet-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc-application
-          image: ghcr.io/cau-se/theodolite-uc3-hazelcastjet:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc3-hazelcastjet:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap: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 1adce8f967f564189a1c93e5fb6da49343944648..ada2221c37df0160b95095e1a877c43c38256c2f 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc3-kstreams-app:v0.8.5
           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 6628aa2debf693a32771f2a5177fe549d236daec..7361d04ba4c8064bc3e494f0d9c1603a8c86d4f5 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc3-workload-generator:v0.8.5
           ports:
             - containerPort: 5701
               name: coordination
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml
index 0a5fbc212f0a8b817ff669e29e6050274619cc5f..a6905b2e74c4f9dfc369b5c39faa2d2a07606da0 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: jobmanager
-          image: ghcr.io/cau-se/theodolite-uc4-beam-flink:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc4-beam-flink:v0.8.5
           args: ["standalone-job", "--job-classname", "rocks.theodolite.benchmarks.uc4.beam.flink.Uc4BeamFlink",
                   "--parallelism=$(PARALLELISM)",
                   "--disableMetrics=true",
diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml
index 8b4ada99b7f6a4117796e5bf7cd0d0a4c365a4a8..7f42d73b9a870bc639140d0ef08ce530deb8b010 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: taskmanager
-          image: ghcr.io/cau-se/theodolite-uc4-beam-flink:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc4-beam-flink:v0.8.5
           args: ["taskmanager"]
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
index 51cd373024c55a8eb08059f6d164d3f36ff37c5a..41f1b17b08cff1f6420b0707ca800ce068447c08 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc4-beam-samza
-          image: ghcr.io/cau-se/theodolite-uc4-beam-samza:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc4-beam-samza:v0.8.5
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
               value: "theodolite-kafka-zoo-entrance:2181"
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml
index 6126bea5e24b98c6268ac2cf6120b44cc267e6c7..86234585afe86f568d2bc58a4aff645004d55187 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc4-flink:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml
index 59667f033df14f21e2591e09197b6ca18f3fe857..8f8075727ef2dc07623bfbc324769fbb02ac2798 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-uc3-flink:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc3-flink:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml
index 0042175b969552dfa0bd2ae0c1609f74337172fa..b08bc39f72ffe8829f83a4730683df89bcec075c 100644
--- a/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/resources/uc4-hazelcastjet-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc-application
-          image: ghcr.io/cau-se/theodolite-uc4-hazelcastjet:v0.8.4
+          image: ghcr.io/cau-se/theodolite-uc4-hazelcastjet:v0.8.5
           env:
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap: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 4ada9e58ae0775e4336e07ce25a16e753c5be599..016b37e8403af89c32bd7f1dff6e6fea07219229 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc4-kstreams-app:v0.8.5
           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 c2eeb04402a805caaece027741c31120fd9c421e..174d0a5a7d81200fb9490a2e59965869bf4c1344 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.8.4
+          image: ghcr.io/cau-se/theodolite-uc4-workload-generator:v0.8.5
           ports:
             - containerPort: 5701
               name: coordination
diff --git a/theodolite-benchmarks/docker-test/uc1-beam-flink/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-beam-flink/docker-compose.yml
index 5b801e05a85cd7496a7d3ab92283f90550d7ec8d..7ca52c23fdefeecf3253b8b400462d83ac434574 100644
--- a/theodolite-benchmarks/docker-test/uc1-beam-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-beam-flink/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -49,7 +49,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       NUM_SENSORS: 10
   benchmark-jobmanager:
-      image: ghcr.io/cau-se/theodolite-uc1-beam-flink:${THEODOLITE_TAG:-v0.8.4}
+      image: ghcr.io/cau-se/theodolite-uc1-beam-flink:${THEODOLITE_TAG:-v0.8.5}
       #ports:
       #  - "8080:8081"
       command: >
@@ -67,7 +67,7 @@ services:
         - schema-registry
         - kafka
   benchmark-taskmanager:
-      image: ghcr.io/cau-se/theodolite-uc1-beam-flink:${THEODOLITE_TAG:-v0.8.4}
+      image: ghcr.io/cau-se/theodolite-uc1-beam-flink:${THEODOLITE_TAG:-v0.8.5}
       scale: 1
       command: taskmanager
       environment:
diff --git a/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml
index 63c057a11479d10d409902db025b7b641602e473..abdea807d8f84bdfc3772f681b736507a8757269 100644
--- a/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc1-beam-samza:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-beam-samza:${THEODOLITE_TAG:-v0.8.5}
     scale: 1
     depends_on:
       - schema-registry
@@ -52,7 +52,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:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc1-flink/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-flink/docker-compose.yml
index 6d048bd03da030e109b9bf87df0f4cb9516b541c..b028aa9b4c103f63f44befe5906ba6ab43be1169 100755
--- a/theodolite-benchmarks/docker-test/uc1-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-flink/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -49,7 +49,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       NUM_SENSORS: 10
   benchmark-jobmanager:
-    image: ghcr.io/cau-se/theodolite-uc1-flink:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-flink:${THEODOLITE_TAG:-v0.8.5}
     #ports:
     #  - "8080:8081"
     command: standalone-job --job-classname rocks.theodolite.benchmarks.uc1.flink.HistoryServiceFlinkJob
@@ -64,7 +64,7 @@ services:
       - schema-registry
       - kafka
   benchmark-taskmanager:
-    image: ghcr.io/cau-se/theodolite-uc1-flink:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-flink:${THEODOLITE_TAG:-v0.8.5}
     command: taskmanager
     environment:
       - |
diff --git a/theodolite-benchmarks/docker-test/uc1-hazelcastjet/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-hazelcastjet/docker-compose.yml
index 9f607d1fc7d52794a52d3165e694dec26867b4fb..0c7c49f9ed9f041fb307682006426c158c998ea9 100644
--- a/theodolite-benchmarks/docker-test/uc1-hazelcastjet/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-hazelcastjet/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc1-hazelcastjet:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-hazelcastjet:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -51,7 +51,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:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc1-kstreams/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-kstreams/docker-compose.yml
index 8f856515fca0d7724b455f1c7c38869e3fd3cf8a..4eea9fe8af910c8ea94dc34b08941074ce15275c 100755
--- a/theodolite-benchmarks/docker-test/uc1-kstreams/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-kstreams/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -46,7 +46,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:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc1-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc2-beam-flink/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-beam-flink/docker-compose.yml
index fe777891a192d70a7a47b9fa69d08cf07a4aa0f3..9109e9883d77263e5d2369fba3ca8f9674ad722e 100644
--- a/theodolite-benchmarks/docker-test/uc2-beam-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-beam-flink/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -49,7 +49,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       NUM_SENSORS: 10
   benchmark-jobmanager:
-      image: ghcr.io/cau-se/theodolite-uc2-beam-flink:${THEODOLITE_TAG:-v0.8.4}
+      image: ghcr.io/cau-se/theodolite-uc2-beam-flink:${THEODOLITE_TAG:-v0.8.5}
       #ports:
       #  - "8080:8081"
       command: >
@@ -67,7 +67,7 @@ services:
         - schema-registry
         - kafka
   benchmark-taskmanager:
-      image: ghcr.io/cau-se/theodolite-uc2-beam-flink:${THEODOLITE_TAG:-v0.8.4}
+      image: ghcr.io/cau-se/theodolite-uc2-beam-flink:${THEODOLITE_TAG:-v0.8.5}
       scale: 1
       command: taskmanager
       environment:
diff --git a/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml
index a0808f1390b891763c968febf68fe90d43d18e8f..7fec3a1a418562c7472959d86220e462918f5add 100644
--- a/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc2-beam-samza:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-beam-samza:${THEODOLITE_TAG:-v0.8.5}
     scale: 1
     depends_on:
       - schema-registry
@@ -52,7 +52,7 @@ services:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc2-flink/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-flink/docker-compose.yml
index 5a74fa36d92575b35570e474c34e1c9bee0c1a28..b454d7fe4641c6affdc0f0b40f53ed030f057a33 100755
--- a/theodolite-benchmarks/docker-test/uc2-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-flink/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -49,7 +49,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       NUM_SENSORS: 10  
   benchmark-jobmanager:
-    image: ghcr.io/cau-se/theodolite-uc2-flink:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-flink:${THEODOLITE_TAG:-v0.8.5}
     #ports:
     #  - "8080:8081"
     command: standalone-job --job-classname rocks.theodolite.benchmarks.uc2.flink.HistoryServiceFlinkJob
@@ -64,7 +64,7 @@ services:
       - schema-registry
       - kafka
   benchmark-taskmanager:
-    image: ghcr.io/cau-se/theodolite-uc2-flink:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-flink:${THEODOLITE_TAG:-v0.8.5}
     command: taskmanager
     environment:
       - |
diff --git a/theodolite-benchmarks/docker-test/uc2-hazelcastjet/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-hazelcastjet/docker-compose.yml
index 4b3bbd81e669e5595ab53b77d24c5e6033a02170..5f15c8cabc0a5923e28eb05820cb556df9e7744b 100644
--- a/theodolite-benchmarks/docker-test/uc2-hazelcastjet/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-hazelcastjet/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc2-hazelcastjet:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-hazelcastjet:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -52,7 +52,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       DOWNSAMPLE_INTERVAL: 5000
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc2-kstreams/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-kstreams/docker-compose.yml
index 01287f97f212239f5cf383397a4bae6dee5533eb..ce9b721521ce18b156c1e82157944bf52c8c5c97 100755
--- a/theodolite-benchmarks/docker-test/uc2-kstreams/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-kstreams/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc2-kstreams-app:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-kstreams-app:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -47,7 +47,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:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc3-beam-flink/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-beam-flink/docker-compose.yml
index 7eb30308cb221139f4002c50b3feb9cdbe809754..a6e36c86546cae567411f607a14747131d164342 100644
--- a/theodolite-benchmarks/docker-test/uc3-beam-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-beam-flink/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -49,7 +49,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       NUM_SENSORS: 10
   benchmark-jobmanager:
-      image: ghcr.io/cau-se/theodolite-uc3-beam-flink:${THEODOLITE_TAG:-v0.8.4}
+      image: ghcr.io/cau-se/theodolite-uc3-beam-flink:${THEODOLITE_TAG:-v0.8.5}
       #ports:
       #  - "8080:8081"
       command: >
@@ -69,7 +69,7 @@ services:
         - schema-registry
         - kafka
   benchmark-taskmanager:
-      image: ghcr.io/cau-se/theodolite-uc3-beam-flink:${THEODOLITE_TAG:-v0.8.4}
+      image: ghcr.io/cau-se/theodolite-uc3-beam-flink:${THEODOLITE_TAG:-v0.8.5}
       scale: 1
       command: taskmanager
       environment:
diff --git a/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml
index bc8458b9c10d01417b7ba4ffc5f6215ef6e8f870..01b67b6d1796a965d2677458933003eef4452995 100644
--- a/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc3-beam-samza:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-beam-samza:${THEODOLITE_TAG:-v0.8.5}
     scale: 1
     depends_on:
       - schema-registry
@@ -52,7 +52,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:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc3-flink/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-flink/docker-compose.yml
index 7d3b766a2c48df39985c238934316447a6fdfd68..5972754ac9878f1dda62657aa6a0990b500b1245 100755
--- a/theodolite-benchmarks/docker-test/uc3-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-flink/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -49,7 +49,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       NUM_SENSORS: 10
   benchmark-jobmanager:
-    image: ghcr.io/cau-se/theodolite-uc3-flink:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-flink:${THEODOLITE_TAG:-v0.8.5}
     #ports:
     #  - "8080:8081"
     command: standalone-job --job-classname rocks.theodolite.benchmarks.uc3.flink.HistoryServiceFlinkJob
@@ -64,7 +64,7 @@ services:
       - schema-registry
       - kafka
   benchmark-taskmanager:
-    image: ghcr.io/cau-se/theodolite-uc3-flink:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-flink:${THEODOLITE_TAG:-v0.8.5}
     command: taskmanager
     environment:
       - |
diff --git a/theodolite-benchmarks/docker-test/uc3-hazelcastjet/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-hazelcastjet/docker-compose.yml
index 5a965cf9e14f30b6f35f7a5f41da7b2352364c57..b20366849b026a7cee2777e62c4a8222ebe3ffac 100644
--- a/theodolite-benchmarks/docker-test/uc3-hazelcastjet/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-hazelcastjet/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc3-hazelcastjet:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-hazelcastjet:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -53,7 +53,7 @@ services:
       WINDOW_SIZE_IN_SECONDS: 50
       HOPPING_SIZE_IN_SECONDS: 5
   load-generator:
-    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc3-kstreams/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-kstreams/docker-compose.yml
index 5da0399741e0b80afa42cd03bb8bfb8258d27779..c30f85e9d8063a107391ec242f14b44ca71213cf 100755
--- a/theodolite-benchmarks/docker-test/uc3-kstreams/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-kstreams/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc3-kstreams-app:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-kstreams-app:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -46,7 +46,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:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml
index f5b8174b064dd2d0d3c99be4909c11f05b0f9415..9a9376db1ab884af7314352d0ff5d5f78bcfb3b0 100644
--- a/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -50,7 +50,7 @@ services:
       NUM_SENSORS: 4
       NUM_NESTED_GROUPS: 3
   benchmark-jobmanager:
-      image: ghcr.io/cau-se/theodolite-uc4-beam-flink:${THEODOLITE_TAG:-v0.8.4}
+      image: ghcr.io/cau-se/theodolite-uc4-beam-flink:${THEODOLITE_TAG:-v0.8.5}
       #ports:
       #  - "8080:8081"
       command: >
@@ -71,7 +71,7 @@ services:
         - schema-registry
         - kafka
   benchmark-taskmanager:
-      image: ghcr.io/cau-se/theodolite-uc4-beam-flink:${THEODOLITE_TAG:-v0.8.4}
+      image: ghcr.io/cau-se/theodolite-uc4-beam-flink:${THEODOLITE_TAG:-v0.8.5}
       scale: 1
       command: taskmanager
       environment:
diff --git a/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
index cfe2d0bd9fcb9d5ceed86d5e82a63f51526f5ab9..8843f226d4bc0f39a6e0bd258b0172bb5d36381f 100644
--- a/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc4-beam-samza:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-beam-samza:${THEODOLITE_TAG:-v0.8.5}
     scale: 1
     depends_on:
       - schema-registry
@@ -52,7 +52,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:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc4-flink/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-flink/docker-compose.yml
index 6a7786f0ff5a607e197a145cd2c4603a93d627e1..2bad9b357685ff4b9f0838460a364d83d97a8140 100755
--- a/theodolite-benchmarks/docker-test/uc4-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-flink/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -50,7 +50,7 @@ services:
       NUM_SENSORS: 4
       NUM_NESTED_GROUPS: 3
   benchmark-jobmanager:
-    image: ghcr.io/cau-se/theodolite-uc4-flink:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-flink:${THEODOLITE_TAG:-v0.8.5}
     #ports:
     #  - "8080:8081"
     command: standalone-job --job-classname rocks.theodolite.benchmarks.uc4.flink.AggregationServiceFlinkJob
@@ -65,7 +65,7 @@ services:
       - schema-registry
       - kafka
   benchmark-taskmanager:
-    image: ghcr.io/cau-se/theodolite-uc4-flink:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-flink:${THEODOLITE_TAG:-v0.8.5}
     command: taskmanager
     environment:
       - |
diff --git a/theodolite-benchmarks/docker-test/uc4-hazelcastjet/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-hazelcastjet/docker-compose.yml
index 52eefeb6129d25f737a6901fcc53f2f9b4e06c58..0bde0b8a66168274baf0129673ddb63afb79592c 100644
--- a/theodolite-benchmarks/docker-test/uc4-hazelcastjet/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-hazelcastjet/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc4-hazelcastjet:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-hazelcastjet:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -52,7 +52,7 @@ services:
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       WINDOW_SIZE_UC4: 5000
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc4-kstreams/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-kstreams/docker-compose.yml
index a1f358a380620fba1ab7085a7a34b88a58a07446..9370c56824d15243af6b73925f2dca4246cb5297 100755
--- a/theodolite-benchmarks/docker-test/uc4-kstreams/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-kstreams/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: ghcr.io/cau-se/theodolite-uc4-kstreams-app:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-kstreams-app:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
@@ -46,7 +46,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:${THEODOLITE_TAG:-v0.8.4}
+    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-v0.8.5}
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite/README.md b/theodolite/README.md
index 0e1d811d1131c82faa68acbc198eff691cf441bd..b2f7995cc6bb12e6fd84e027c181623f32659cff 100644
--- a/theodolite/README.md
+++ b/theodolite/README.md
@@ -51,7 +51,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.8.4-runner```
+```./build/theodolite-0.8.5-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 5a6bc85eee621bd0a9201f9203cd235d8a401821..b39e8e4a7a6b93a9a58356c63f8dbb9ecd119473 100644
--- a/theodolite/build.gradle
+++ b/theodolite/build.gradle
@@ -38,7 +38,7 @@ dependencies {
 }
 
 group 'theodolite'
-version '0.8.4'
+version '0.8.5'
 
 java {
     sourceCompatibility = JavaVersion.VERSION_11