diff --git a/modules/events-processors/build.gradle.kts b/modules/events-processors/build.gradle.kts
index 3134526..37ea412 100644
--- a/modules/events-processors/build.gradle.kts
+++ b/modules/events-processors/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   id("kafkatorio.conventions.lang.kotlin-jvm")
+  id("dev.adamko.geedeecee")
   kotlin("plugin.serialization")
   application
 }
@@ -75,7 +76,6 @@ tasks.withType<KotlinCompile>().configureEach {
 //}
 
 tasks.named("run") {
-
   val kafkaStateDir: Directory = layout.projectDirectory.dir(".state/kafka/")
 
   doFirst {
@@ -89,3 +89,7 @@ val runEventsProcessors by tasks.registering {
 
   dependsOn(tasks.run)
 }
+
+tasks.dockerComposeBuild {
+  dependsOn(tasks.distTar)
+}
diff --git a/modules/events-server-syslog/build.gradle.kts b/modules/events-server-syslog/build.gradle.kts
index 8d1bad2..ca3a7ed 100644
--- a/modules/events-server-syslog/build.gradle.kts
+++ b/modules/events-server-syslog/build.gradle.kts
@@ -87,3 +87,7 @@ val runSyslogServer by tasks.registering {
   group = rootProject.name
   dependsOn(tasks.run)
 }
+
+tasks.dockerComposeBuild {
+  dependsOn(tasks.distTar)
+}
diff --git a/modules/web-map/build.gradle.kts b/modules/web-map/build.gradle.kts
index 821be54..f2582c3 100644
--- a/modules/web-map/build.gradle.kts
+++ b/modules/web-map/build.gradle.kts
@@ -1,6 +1,6 @@
 import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
-import dev.adamko.geedeecee.DockerEnvUpdateTask.Companion.put
+
 
 plugins {
   id("kafkatorio.conventions.lang.kotlin-js")
@@ -75,18 +75,18 @@ kotlin {
         implementation(libs.kotlinx.nodejs)
         implementation(libs.kotlinx.html)
 
-        kvision("kvision")
-        kvision("kvision-bootstrap")
-        kvision("kvision-bootstrap-css")
-        kvision("kvision-bootstrap-icons")
-        kvision("kvision-fontawesome")
-        kvision("kvision-state")
-        kvision("kvision-chart")
-        kvision("kvision-maps")
-        kvision("kvision-rest")
-        kvision("kvision-redux")
-        kvision("kvision-state-flow")
-        kvision("kvision-routing-navigo-ng")
+        implementation(kvision())
+        implementation(kvision("bootstrap"))
+        implementation(kvision("bootstrap-css"))
+        implementation(kvision("bootstrap-icons"))
+        implementation(kvision("fontawesome"))
+        implementation(kvision("state"))
+        implementation(kvision("chart"))
+        implementation(kvision("maps"))
+        implementation(kvision("rest"))
+        implementation(kvision("redux"))
+        implementation(kvision("state-flow"))
+        implementation(kvision("routing-navigo-ng"))
       }
 
       resources.srcDir("src/main/web")
@@ -97,7 +97,7 @@ kotlin {
       dependencies {
         implementation(kotlin("test"))
 
-        kvision("kvision-testutils")
+        implementation(kvision("testutils"))
         //        implementation(npm("karma", "^6.3.16"))
       }
     }
@@ -105,29 +105,15 @@ kotlin {
 }
 
 
+@Suppress("UnusedReceiverParameter") // just for scoping - this function doesn't need to be used everywhere
 fun KotlinDependencyHandler.kvision(
-  module: String,
+  module: String? = null,
   version: Provider<String> = libs.versions.kvision,
-  configure: ExternalModuleDependency.() -> Unit = {
-//    isChanging = true
-  }
-) {
-  implementation("io.kvision:$module:${version.get()}", configure)
+): String {
+  val prefixedModule = if (module == null) "kvision" else "kvision-$module"
+  return "io.kvision:$prefixedModule:${version.get()}"
 }
 
-geedeecee {
-  srcDir.set(layout.projectDirectory.dir("docker"))
-}
-
-tasks.dockerComposeEnvUpdate {
-  envProperties {
-    put("KAFKATORIO_VERSION" to project.version.toString())
-    put("REGISTRY_HOST" to "dcr.adamko.dev:5000")
-  }
-}
-
-tasks.assemble { dependsOn(tasks.dockerComposeEnvUpdate) }
-
 
 val installThemeCss by tasks.registering(Copy::class) {
   val bootswatchThemeMinCss = resources.text.fromUri(