diff --git a/uc3-application/Dockerfile b/uc3-application/Dockerfile
index 9b17de3af09feb1af8d14fd277d88c8c2797142e..c70a24268e114e924b5f06dc7a8979100f5d8455 100644
--- a/uc3-application/Dockerfile
+++ b/uc3-application/Dockerfile
@@ -1,6 +1,8 @@
 FROM openjdk:11-slim
 
-ADD build/distributions/exp-bigdata19-bridge.tar /
 
-CMD export JAVA_OPTS=-Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL \
-    && /exp-bigdata19-bridge/bin/exp-bigdata19-bridge
\ No newline at end of file
+ADD build/distributions/uc3-application.tar /
+
+
+CMD  JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
+     /uc3-application/bin/uc3-application
\ No newline at end of file
diff --git a/uc3-application/build.gradle b/uc3-application/build.gradle
index 12e597b37f775a7ad48a7e6009ed075213e1712b..b0279201322e94d9bd9b14222a2dc218f18b4309 100644
--- a/uc3-application/build.gradle
+++ b/uc3-application/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     testCompile 'junit:junit:4.12'
 }
 
-mainClassName = "titan.ccp.kiekerbridge.expbigdata19.ExperimentorBigData"
+mainClassName = "uc3.application.HistoryService"
 
 eclipse {
     classpath {
diff --git a/uc3-application/src/main/java/uc3/application/HistoryService.java b/uc3-application/src/main/java/uc3/application/HistoryService.java
index e8385da5875be7789232183395018ab2df0eac95..26c9584d26cf0313504f093474c1421e5a07b5e8 100644
--- a/uc3-application/src/main/java/uc3/application/HistoryService.java
+++ b/uc3-application/src/main/java/uc3/application/HistoryService.java
@@ -1,6 +1,7 @@
 package uc3.application;
 
 import java.time.Duration;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import org.apache.commons.configuration2.Configuration;
 import org.apache.kafka.streams.KafkaStreams;
@@ -17,6 +18,8 @@ public class HistoryService {
 	private final Configuration config = Configurations.create();
 
 	private final CompletableFuture<Void> stopEvent = new CompletableFuture<>();
+	final int KAFKA_WINDOW_DURATION_MINUTES = Integer
+			.parseInt(Objects.requireNonNullElse(System.getenv("KAFKA_WINDOW_DURATION_MINUTES"), "60"));
 
 	/**
 	 * Start the service.
@@ -37,7 +40,7 @@ public class HistoryService {
 				.bootstrapServers(this.config.getString(ConfigurationKeys.KAFKA_BOOTSTRAP_SERVERS))
 				.inputTopic(this.config.getString(ConfigurationKeys.KAFKA_INPUT_TOPIC))
 				.outputTopic(this.config.getString(ConfigurationKeys.KAFKA_OUTPUT_TOPIC))
-				.windowDuration(Duration.ofMinutes(this.config.getInt(ConfigurationKeys.KAFKA_WINDOW_DURATION_MINUTES)))
+				.windowDuration(Duration.ofMinutes(this.KAFKA_WINDOW_DURATION_MINUTES))
 				.numThreads(this.config.getInt(ConfigurationKeys.NUM_THREADS))
 				.commitIntervalMs(this.config.getInt(ConfigurationKeys.COMMIT_INTERVAL_MS))
 				.cacheMaxBytesBuffering(this.config.getInt(ConfigurationKeys.CACHE_MAX_BYTES_BUFFERING)).build();
diff --git a/uc3-application/src/main/resources/META-INF/application.properties b/uc3-application/src/main/resources/META-INF/application.properties
new file mode 100644
index 0000000000000000000000000000000000000000..d2002fd1c8841368d47017b2ce7939bfc42877aa
--- /dev/null
+++ b/uc3-application/src/main/resources/META-INF/application.properties
@@ -0,0 +1,6 @@
+kafka.bootstrap.servers=localhost:9092
+kafka.input.topic=input
+kafka.output.topic=output
+num.threads=1
+commit.interval.ms=10
+cache.max.bytes.buffering=-1