diff --git a/modules/events-processor-core/src/main/kotlin/dev/adamko/kafkatorio/processor/config/ApplicationProperties.kt b/modules/events-processor-core/src/main/kotlin/dev/adamko/kafkatorio/processor/config/ApplicationProperties.kt
index 7d8a020..f55e2c6 100644
--- a/modules/events-processor-core/src/main/kotlin/dev/adamko/kafkatorio/processor/config/ApplicationProperties.kt
+++ b/modules/events-processor-core/src/main/kotlin/dev/adamko/kafkatorio/processor/config/ApplicationProperties.kt
@@ -9,7 +9,7 @@ import dev.adamko.kafkatorio.schema.common.FactorioServerToken
 import dev.adamko.kafkatorio.schema.common.MaskedValue
 import java.nio.file.Path
 
-val appProps = ApplicationProperties.load()
+internal val appProps = ApplicationProperties.load()
 
 data class ApplicationProperties(
   val webPort: PortVal,
diff --git a/modules/events-server-web/src/main/kotlin/dev/adamko/kafkatorio/server/web/main.kt b/modules/events-server-web/src/main/kotlin/dev/adamko/kafkatorio/server/web/main.kt
index 4ce5ae0..572a854 100644
--- a/modules/events-server-web/src/main/kotlin/dev/adamko/kafkatorio/server/web/main.kt
+++ b/modules/events-server-web/src/main/kotlin/dev/adamko/kafkatorio/server/web/main.kt
@@ -13,8 +13,9 @@ import org.apache.kafka.clients.producer.ProducerConfig
 import org.apache.kafka.streams.StreamsBuilder
 import org.apache.kafka.streams.StreamsConfig
 
+internal val appProps = ApplicationProperties.load()
+
 suspend fun main(): Unit = coroutineScope {
-  val appProps = ApplicationProperties.load()
   val wsServer = WebmapWebsocketServer()
 
   launch {
@@ -45,10 +46,13 @@ private suspend fun websocketBroadcaster(wsServer: WebmapWebsocketServer) {
   val topology = builder.build()
 
   launchTopology(
-    "websocketBroadcaster", topology, mapOf(
+    id = "websocketBroadcaster",
+    topology = topology,
+    additionalProperties = mapOf(
       StreamsConfig.COMMIT_INTERVAL_MS_CONFIG to "${1.seconds.inWholeMilliseconds}",
-      StreamsConfig.producerPrefix(ProducerConfig.LINGER_MS_CONFIG) to "${1.milliseconds.inWholeMilliseconds}"
-    )
+      StreamsConfig.producerPrefix(ProducerConfig.LINGER_MS_CONFIG) to "${1.milliseconds.inWholeMilliseconds}",
+    ),
+    appProps = appProps,
   )
 }
 
@@ -57,5 +61,9 @@ private suspend fun saveTiles(
 ) {
   val builder = StreamsBuilder()
   saveMapTiles(builder, appProps.serverDataDir)
-  launchTopology("saveTiles", builder.build())
+  launchTopology(
+    id = "saveTiles",
+    topology = builder.build(),
+    appProps = appProps
+  )
 }