diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/Uc3ConfigurationKeys.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/Uc3ConfigurationKeys.java
index ca59d3d2f5db72bd5378e7616b323f74d926e51e..09bc8a26b6261400f7d341d53146e2435aee3507 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/Uc3ConfigurationKeys.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/Uc3ConfigurationKeys.java
@@ -11,8 +11,7 @@ public final class Uc3ConfigurationKeys {
 
   public static final String AGGREGATION_ADVANCE_DAYS = "aggregation.advance.days";
 
-  public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval";
-  // public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval.seconds";
+  public static final String TRIGGER_INTERVAL_SECONDS = "aggregation.trigger.interval.seconds";
 
   private Uc3ConfigurationKeys() {}
 
diff --git a/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
index f4511d5f1f182647210f24459e3d2f1db84eea29..54af67893c54bda1a23b7fd428e7c0f9931a1aa6 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc3-beam/src/main/resources/META-INF/application.properties
@@ -9,9 +9,7 @@ schema.registry.url=http://localhost:8081
 
 aggregation.duration.days=30
 aggregation.advance.days=1
-
-# in seconds
-trigger.interval=15
+aggregation.trigger.interval.seconds=15
 
 specific.avro.reader=true
 
diff --git a/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
index 24fb0b0b7044df51e44a7291dfc53ced89008e5f..1d91a3b492fb2a4aee23476f43f74796f0e5d8df 100644
--- a/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc3-flink/src/main/resources/META-INF/application.properties
@@ -5,11 +5,11 @@ kafka.bootstrap.servers=localhost:9092
 kafka.input.topic=input
 kafka.output.topic=output
 schema.registry.url=http://localhost:8081
+
+time.zone=Europe/Paris
 aggregation.duration.days=30
 aggregation.advance.days=1
 aggregation.trigger.interval.seconds=15
 
-time.zone=Europe/Paris
-
 # Flink configuration
 checkpointing.interval.ms=1000
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/resources/META-INF/application.properties b/theodolite-benchmarks/uc3-hazelcastjet/src/main/resources/META-INF/application.properties
index 53e559dc32b4950ce677597e6724e016bc2bc2d2..7b28bf5c4047b1f644703268969fe9c680b50238 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/resources/META-INF/application.properties
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/resources/META-INF/application.properties
@@ -4,9 +4,8 @@ application.version=0.0.1
 kafka.bootstrap.servers=localhost:9092
 kafka.input.topic=input
 kafka.output.topic=output
+schema.registry.url=http://localhost:8081
+
 aggregation.duration.days=30
 aggregation.advance.days=1
 aggregation.emit.period.seconds=15
-
-schema.registry.url=http://localhost:8081
-
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
index 2bba46d9bd66d32fce3e9937ecae62a32a509e8f..200e0da601faeadd790cf1fd0deeba38e6b1a7fa 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/PipelineFactory.java
@@ -74,9 +74,10 @@ public class PipelineFactory extends AbstractPipelineFactory {
 
     final Duration duration = Duration.millis(
         this.config.getInt(Uc4ConfigurationKeys.EMIT_PERIOD_MS));
+    // final boolean enableTrigger = this.config.getBoolean(Uc4ConfigurationKeys.TRIGGER_ENABLE);
     final Duration triggerDelay = Duration.standardSeconds(
         this.config.getInt(Uc4ConfigurationKeys.TRIGGER_INTERVAL_SECONDS));
-    final Duration gracePeriod = Duration.standardSeconds(// TODO this is wrong
+    final Duration gracePeriod = Duration.millis(
         this.config.getInt(Uc4ConfigurationKeys.GRACE_PERIOD_MS));
 
     // Read from Kafka
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/Uc4ConfigurationKeys.java b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/Uc4ConfigurationKeys.java
index 860e8c9daa148e3ed245b2d8aec54227d8e91a19..0f314f1497708f73c7bc00337438f7a53d081731 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/Uc4ConfigurationKeys.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/rocks/theodolite/benchmarks/uc4/beam/Uc4ConfigurationKeys.java
@@ -15,8 +15,9 @@ public final class Uc4ConfigurationKeys {
 
   public static final String GRACE_PERIOD_MS = "grace.period.ms";
 
-  public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval";
-  // public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval.seconds";
+  // public static final String TRIGGER_ENABLE = "trigger.enable";
+
+  public static final String TRIGGER_INTERVAL_SECONDS = "trigger.interval.seconds";
 
   private Uc4ConfigurationKeys() {}
 
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 a5dc4cfaccdb57317d6505bc597f43a7f79a4caf..654d7d94b70ff03cab6152fef67c55a073a58704 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,8 +10,9 @@ kafka.feedback.topic=aggregation-feedback
 schema.registry.url=http://localhost:8081
 
 emit.period.ms=5000
-trigger.interval=15
-grace.period.ms=270
+#trigger.enable=true
+trigger.interval.seconds=15
+grace.period.ms=270000
 
 specific.avro.reader=true