diff --git a/theodolite-benchmarks/docker-test/uc1-hazelcastjet-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-hazelcastjet-docker-compose/docker-compose.yml
index 201b5ade89b1f6cbfe90904e7c0ebfdc211b46e0..f1e0cbdf53889e6c72311327c168bc262d48b3d2 100644
--- a/theodolite-benchmarks/docker-test/uc1-hazelcastjet-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-hazelcastjet-docker-compose/docker-compose.yml
@@ -3,21 +3,22 @@ services:
   zookeeper:
     image: confluentinc/cp-zookeeper
     expose:
-      - "9092"
+      - "2181"
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
   kafka:
     image: wurstmeister/kafka
     expose:
       - "9092"
-    ports:
-      - 19092:19092
+    #ports:
+    #  - 19092:19092
     environment:
       KAFKA_LISTENERS: PLAINTEXT://:9092,CONNECTIONS_FROM_HOST://:19092
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,CONNECTIONS_FROM_HOST://localhost:19092
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONNECTIONS_FROM_HOST:PLAINTEXT
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_ZOOKEEPER_CONNECTION_TIMEOUT_MS: 30000
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
       KAFKA_CREATE_TOPICS: "input:3:1,output:3:1,configuration:3:1,aggregation-feedback:3:1"
   schema-registry:
     image: confluentinc/cp-schema-registry:5.3.1
@@ -26,8 +27,8 @@ services:
       - kafka
     expose:
       - "8081"
-    ports:
-      - 8081:8081
+    #ports:
+    #  - 8081:8081
     environment:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
@@ -36,26 +37,10 @@ services:
     depends_on:
       - schema-registry
       - kafka
-    environment:
-      BOOTSTRAP_SERVER: benchmark:5701
-      KAFKA_BOOTSTRAP_SERVERS: kafka:9092
-      SCHEMA_REGISTRY_URL: http://schema-registry:8081
-    ports:
-      - 5701:5701
-  benchmark2: 
-    image: uc1-hazelcastjet
-    depends_on:
-      - schema-registry
-      - kafka
-    environment:
-      BOOTSTRAP_SERVER: benchmark:5701
-      KAFKA_BOOTSTRAP_SERVERS: kafka:9092
-      SCHEMA_REGISTRY_URL: http://schema-registry:8081
-  benchmark3: 
-    image: uc1-hazelcastjet
-    depends_on:
-      - schema-registry
-      - kafka
+    expose:
+      - 5701
+    #ports:
+    #  - 5701:5701
     environment:
       BOOTSTRAP_SERVER: benchmark:5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
@@ -66,7 +51,7 @@ services:
       - schema-registry
       - kafka
     environment:
-      BOOTSTRAP_SERVER: uc-wg:5701
+      BOOTSTRAP_SERVER: load-generator
       PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
diff --git a/theodolite-benchmarks/docker-test/uc2-hazelcastjet-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-hazelcastjet-docker-compose/docker-compose.yml
index a2d2494f7ddc45f9e6d5e29edc44087cdfa72110..051ff1f7c4ae05bae21c3f06ce85d1889033ba6b 100644
--- a/theodolite-benchmarks/docker-test/uc2-hazelcastjet-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-hazelcastjet-docker-compose/docker-compose.yml
@@ -2,32 +2,33 @@ version: '2'
 services:
   zookeeper:
     image: confluentinc/cp-zookeeper
-    ports:
-      - "2181:2181"
+    expose:
+      - "2181"
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
   kafka:
     image: wurstmeister/kafka
     expose:
       - "9092"
-    ports:
-      - 19092:19092
+    #ports:
+    #  - 19092:19092
     environment:
       KAFKA_LISTENERS: PLAINTEXT://:9092,CONNECTIONS_FROM_HOST://:19092
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,CONNECTIONS_FROM_HOST://localhost:19092
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONNECTIONS_FROM_HOST:PLAINTEXT
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_ZOOKEEPER_CONNECTION_TIMEOUT_MS: 30000
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
       KAFKA_CREATE_TOPICS: "input:3:1,output:3:1,configuration:3:1,aggregation-feedback:3:1"
   schema-registry:
     image: confluentinc/cp-schema-registry:5.3.1
     depends_on:
       - zookeeper
       - kafka
-    ports:
-      - "8081:8081"
     expose:
       - "8081"
+    #ports:
+    #  - 8081:8081
     environment:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
@@ -36,18 +37,10 @@ services:
     depends_on:
       - schema-registry
       - kafka
-    environment:
-      BOOTSTRAP_SERVER: benchmark:5701
-      KAFKA_BOOTSTRAP_SERVERS: kafka:9092
-      SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      DOWNSAMPLE_INTERVAL: 5000
-    ports:
-      - 5701:5701
-  benchmark2:
-    image: uc2-hazelcastjet
-    depends_on:
-      - schema-registry
-      - kafka
+    expose:
+      - 5701
+    #ports:
+    #  - 5701:5701
     environment:
       BOOTSTRAP_SERVER: benchmark:5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
@@ -59,7 +52,7 @@ services:
       - schema-registry
       - kafka
     environment:
-      BOOTSTRAP_SERVER: uc-wg:5701
+      BOOTSTRAP_SERVER: load-generator:5701
       PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
diff --git a/theodolite-benchmarks/docker-test/uc3-hazelcastjet-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-hazelcastjet-docker-compose/docker-compose.yml
index 75d6a7195452f42b35b3b7f43a39ecd6f67c7199..27a6713c238224a89899d11f1654d611498e5427 100644
--- a/theodolite-benchmarks/docker-test/uc3-hazelcastjet-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-hazelcastjet-docker-compose/docker-compose.yml
@@ -2,32 +2,33 @@ version: '2'
 services:
   zookeeper:
     image: confluentinc/cp-zookeeper
-    ports:
-      - "2181:2181"
+    expose:
+      - "2181"
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
   kafka:
     image: wurstmeister/kafka
     expose:
       - "9092"
-    ports:
-      - 19092:19092
+    #ports:
+    #  - 19092:19092
     environment:
       KAFKA_LISTENERS: PLAINTEXT://:9092,CONNECTIONS_FROM_HOST://:19092
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,CONNECTIONS_FROM_HOST://localhost:19092
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONNECTIONS_FROM_HOST:PLAINTEXT
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_ZOOKEEPER_CONNECTION_TIMEOUT_MS: 30000
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
       KAFKA_CREATE_TOPICS: "input:3:1,output:3:1,configuration:3:1,aggregation-feedback:3:1"
   schema-registry:
     image: confluentinc/cp-schema-registry:5.3.1
     depends_on:
       - zookeeper
       - kafka
-    ports:
-      - "8081:8081"
     expose:
       - "8081"
+    #ports:
+    #  - 8081:8081
     environment:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
@@ -36,32 +37,23 @@ services:
     depends_on:
       - schema-registry
       - kafka
+    expose:
+      - 5701
+    #ports:
+    #  - 5701:5701
     environment:
       BOOTSTRAP_SERVER: benchmark:5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       WINDOW_SIZE_IN_SECONDS: 50
       HOPPING_SIZE_IN_SECONDS: 5
-    ports:
-      - 5701:5701
-  benchmark2:
-    image: uc3-hazelcastjet
-    depends_on:
-      - schema-registry
-      - kafka
-    environment:
-      BOOTSTRAP_SERVER: benchmark:5701
-      KAFKA_BOOTSTRAP_SERVERS: kafka:9092
-      SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      WINDOW_SIZE_IN_SECONDS: 50
-      HOPPING_SIZE_IN_SECONDS: 5
-  load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:latest
+  load-generator:
+    image: ghcr.io/cau-se/theodolite-uc3-workload-generator:latest
     depends_on:
       - schema-registry
       - kafka
     environment:
-      BOOTSTRAP_SERVER: uc-wg:5701
+      BOOTSTRAP_SERVER: load-generator:5701
       PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
diff --git a/theodolite-benchmarks/docker-test/uc4-hazelcastjet-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-hazelcastjet-docker-compose/docker-compose.yml
index d747ba04c12d819cafd54877910e78caa76caca4..9045f061fddb095706b4a4a499e20c8a50420438 100644
--- a/theodolite-benchmarks/docker-test/uc4-hazelcastjet-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-hazelcastjet-docker-compose/docker-compose.yml
@@ -2,32 +2,33 @@ version: '2'
 services:
   zookeeper:
     image: confluentinc/cp-zookeeper
-    ports:
-      - "2181:2181"
+    expose:
+      - "2181"
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
   kafka:
     image: wurstmeister/kafka
     expose:
       - "9092"
-    ports:
-      - 19092:19092
+    #ports:
+    #  - 19092:19092
     environment:
       KAFKA_LISTENERS: PLAINTEXT://:9092,CONNECTIONS_FROM_HOST://:19092
       KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,CONNECTIONS_FROM_HOST://localhost:19092
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONNECTIONS_FROM_HOST:PLAINTEXT
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
       KAFKA_ZOOKEEPER_CONNECTION_TIMEOUT_MS: 30000
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
       KAFKA_CREATE_TOPICS: "input:3:1,output:3:1,configuration:3:1,aggregation-feedback:3:1"
   schema-registry:
     image: confluentinc/cp-schema-registry:5.3.1
     depends_on:
       - zookeeper
       - kafka
-    ports:
-      - "8081:8081"
     expose:
       - "8081"
+    #ports:
+    #  - 8081:8081
     environment:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
@@ -36,20 +37,22 @@ services:
     depends_on:
       - schema-registry
       - kafka
+    expose:
+      - 5701
+    #ports:
+    #  - 5701:5701
     environment:
       BOOTSTRAP_SERVER: benchmark:5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       WINDOW_SIZE_UC4: 5000
-    ports:
-      - 5701:5701
   load-generator: 
-    image: ghcr.io/cau-se/theodolite-uc2-workload-generator:latest
+    image: ghcr.io/cau-se/theodolite-uc4-workload-generator:latest
     depends_on:
       - schema-registry
       - kafka
     environment:
-      BOOTSTRAP_SERVER: uc-wg:5701
+      BOOTSTRAP_SERVER: load-generator:5701
       PORT: 5701
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081