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 465fcb6ee6a2b2121dfe359140c259e7a3eb763a..0e3b886e82fb91e2b7ea1c2b78252ad4d78807ee 100644
--- a/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-beam-flink/docker-compose.yml
@@ -67,6 +67,8 @@ services:
           parallelism.default: 1
           state.backend: rocksdb
           state.checkpoints.dir: file:///data/flink/checkpoints
+        - GRACE_PERIOD_MS=5000
+        - TRIGGER_INTERVAL_SECONDS=1
       depends_on:
         - schema-registry
         - kafka
diff --git a/theodolite-benchmarks/docker-test/uc4-beam-flink/test.sh b/theodolite-benchmarks/docker-test/uc4-beam-flink/test.sh
index 6a4c6dbf4f583e7598baefae8f48136bb2113630..a659365f94e5bdd42cad8bc646b5dab563f59563 100755
--- a/theodolite-benchmarks/docker-test/uc4-beam-flink/test.sh
+++ b/theodolite-benchmarks/docker-test/uc4-beam-flink/test.sh
@@ -2,7 +2,7 @@
 
 until docker-compose exec -T kcat kcat -L -b kafka:9092 -t output -J | jq -r '.topics[0].partitions | length' | grep "\b3\b"; do sleep 5s; done
 
-docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=avro -r http://schema-registry:8081 -f '%k:%s\n' -c 2000 |
+docker-compose exec -T kcat kcat -C -b kafka:9092 -t output -s key=s -s value=avro -r http://schema-registry:8081 -f '%k:%s\n' -c 300 |
     tee /dev/stderr |
     awk -F ':' '!/^%/ {print $1}' |
     sort |
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 51011d2d2645c8542724d7f84f29c9cdae970e8e..563dbf5acdb9f7b5dae3e49676de232b3afacada 100644
--- a/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
@@ -52,6 +52,8 @@ services:
       KAFKA_BOOTSTRAP_SERVERS: kafka:9092
       SCHEMA_REGISTRY_URL: http://schema-registry:8081
       ENABLE_METRICS: "false"
+      GRACE_PERIOD_MS: 5000
+      TRIGGER_INTERVAL_SECONDS: 1
   load-generator: 
     image: ghcr.io/cau-se/theodolite-uc4-workload-generator:${THEODOLITE_TAG:-latest}
     depends_on:
diff --git a/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
index 654d7d94b70ff03cab6152fef67c55a073a58704..e761c26461667d09b95b579b5a6452b6c833b342 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc4-beam/src/main/resources/META-INF/application.properties
@@ -10,9 +10,8 @@ kafka.feedback.topic=aggregation-feedback
 schema.registry.url=http://localhost:8081
 
 emit.period.ms=5000
-#trigger.enable=true
-trigger.interval.seconds=15
-grace.period.ms=270000
+trigger.interval.seconds=1
+grace.period.ms=5000
 
 specific.avro.reader=true
 
diff --git a/theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties
index 8a1d86ae3ecc419badae62d62c102ec8fafb4730..3a6048099c554e665c96bebc521e2ba40bea3b1b 100644
--- a/theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc4-kstreams/src/main/resources/META-INF/application.properties
@@ -10,7 +10,7 @@ kafka.output.topic=output
 schema.registry.url=http://localhost:8081
 
 emit.period.ms=5000
-grace.period.ms=0
+grace.period.ms=5000
 
 # Kafka Streams Config
-commit.interval.ms=5000	
+commit.interval.ms=1000