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 c6f901c8ef1245aeb105dc5bf4e021abfdd66abc..cebb9dff9687dd6bce02a5a4feb544c7aaa6a402 100644
--- a/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml
@@ -44,7 +44,6 @@ services:
       SAMZA_JOB_COORDINATOR_ZK_CONNECT: zookeeper:2181
       SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS: kafka:9092
       SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092
-      MAX_SOURCE_PARALLELISM: 1024
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
   load-generator: 
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 5d3320cccda8e1735ab56ec563dbf11912b31896..3de8c697088a85253b4a4ad3e8d59a00ccac4c25 100644
--- a/theodolite-benchmarks/docker-test/uc2-beam-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-beam-flink/docker-compose.yml
@@ -49,11 +49,9 @@ services:
       #  - "8080:8081"
       command: >
         standalone-job --job-classname application.Uc2BeamFlink
-        --streaming
         --disableMetrics=true 
         --fasterCopy 
       environment:
-        - KAFKA_WINDOW_DURATION_MINUTES=60
         - KAFKA_BOOTSTRAP_SERVERS=kafka:9092
         - SCHEMA_REGISTRY_URL=http://schema-registry:8081
         - |
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 f24db061c7b3dbf0760d1b1926750e988be3699e..ce147bc793a06b0e955c46e5f06f92bc8b0b3c14 100644
--- a/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml
@@ -44,10 +44,8 @@ services:
       SAMZA_JOB_COORDINATOR_ZK_CONNECT: zookeeper:2181
       SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS: kafka:9092
       SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092
-      MAX_SOURCE_PARALLELISM: 1024
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
-      KAFKA_WINDOW_DURATION_MINUTES: 60
   load-generator: 
     image: ghcr.io/cau-se/theodolite-uc2-workload-generator:latest
     depends_on:
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 c8abe05d9a5d10cc73a7a13a5df5feeeee58c48d..230c8b6cf8782fa0aeb946c00ac98f40cdc634b5 100644
--- a/theodolite-benchmarks/docker-test/uc3-beam-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-beam-flink/docker-compose.yml
@@ -49,7 +49,6 @@ services:
       #  - "8080:8081"
       command: >
         standalone-job --job-classname application.Uc3BeamFlink
-        --streaming
         --disableMetrics=true 
         --fasterCopy 
       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 9e6b7726284a14c8f3c07a6e21b824f5746812d6..6529005177ec8cb166d229c6269c9a3e91a947a2 100644
--- a/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml
@@ -44,7 +44,6 @@ services:
       SAMZA_JOB_COORDINATOR_ZK_CONNECT: zookeeper:2181
       SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS: kafka:9092
       SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092
-      MAX_SOURCE_PARALLELISM: 1024
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
   load-generator: 
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 fc83f25341e99b948290b89b529c1d158203fe81..98af67717962cb6ceca1f92c629a94ca360fe537 100644
--- a/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
@@ -44,7 +44,6 @@ services:
       SAMZA_JOB_COORDINATOR_ZK_CONNECT: zookeeper:2181
       SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS: kafka:9092
       SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS: kafka:9092
-      MAX_SOURCE_PARALLELISM: 1024
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
   load-generator: