diff --git a/gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/GDCPlugin.kt b/gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/GDCPlugin.kt
index c5d0e15..9034ad2 100644
--- a/gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/GDCPlugin.kt
+++ b/gradle-plugins/docker-compose/src/main/kotlin/dev/adamko/geedeecee/GDCPlugin.kt
@@ -83,6 +83,8 @@ abstract class GDCPlugin @Inject constructor(
       srcDir.convention(layout.projectDirectory.dir("docker"))
 
       dotEnv.put("COMPOSE_PROJECT_NAME", composeProjectName)
+      dotEnv.put("APP_NAME", providers.provider { project.name })
+      dotEnv.put("APP_GROUP", providers.provider { project.group.toString() })
       dotEnv.put("PROJECT_VERSION", composeProjectVersion)
       dotEnv.put("KAFKATORIO_VERSION", composeProjectVersion)
       dotEnv.put("REGISTRY_HOST", containerRegistryHost)
diff --git a/modules/events-processors/docker/Dockerfile b/modules/events-processors/docker/Dockerfile
index 7d3a795..a081b85 100644
--- a/modules/events-processors/docker/Dockerfile
+++ b/modules/events-processors/docker/Dockerfile
@@ -3,6 +3,7 @@
 FROM eclipse-temurin:11-jdk-jammy
 ARG KAFKATORIO_VERSION=0.5.1
 ARG DIST_DIR="../build/distributions/"
+ARG APP_NAME="events-server-web"
 
 WORKDIR /app
 
diff --git a/modules/events-processors/docker/docker-compose.yml b/modules/events-processors/docker/docker-compose.yml
index e871820..47d753a 100644
--- a/modules/events-processors/docker/docker-compose.yml
+++ b/modules/events-processors/docker/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.9"
 services:
 
   events-server:
-    image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/events-processors:${KAFKATORIO_VERSION}
-    container_name: events-server
+    image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
+    container_name: ${APP_NAME}
     restart: unless-stopped
     build:
       context: ..
@@ -12,6 +12,7 @@ services:
       args:
         KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
         DIST_DIR: "./build/distributions/"
+        APP_NAME: ${APP_NAME}
     environment:
       KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
       # KAFKA_STREAMS_STATE_DIR: ""
diff --git a/modules/events-server-syslog/docker/docker-compose.yml b/modules/events-server-syslog/docker/docker-compose.yml
index cecaf6d..b33295c 100644
--- a/modules/events-server-syslog/docker/docker-compose.yml
+++ b/modules/events-server-syslog/docker/docker-compose.yml
@@ -2,9 +2,9 @@ version: "3.9"
 
 services:
 
-  events-server:
-    image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/events-server-syslog:${KAFKATORIO_VERSION}
-    container_name: events-server
+  events-server-syslog:
+    image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
+    container_name: ${APP_NAME}
     restart: unless-stopped
     build:
       context: ..
@@ -12,6 +12,7 @@ services:
       args:
         KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
         DIST_DIR: "./build/distributions/"
+        APP_NAME: ${APP_NAME}
     environment:
       KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
       # KAFKA_STREAMS_STATE_DIR: ""
diff --git a/modules/events-server-web/docker/docker-compose.yml b/modules/events-server-web/docker/docker-compose.yml
index c835897..e8ec9a7 100644
--- a/modules/events-server-web/docker/docker-compose.yml
+++ b/modules/events-server-web/docker/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.9"
 services:
 
   events-server-web:
-    image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/events-server-web:${KAFKATORIO_VERSION}
-    container_name: events-server-web
+    image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
+    container_name: ${APP_NAME}
     restart: unless-stopped
     build:
       context: ..
@@ -12,6 +12,7 @@ services:
       args:
         KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
         DIST_DIR: "./build/distributions/"
+        APP_NAME: ${APP_NAME}
     environment:
       KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
       # KAFKA_STREAMS_STATE_DIR: ""
diff --git a/modules/events-server/docker/docker-compose.yml b/modules/events-server/docker/docker-compose.yml
index 9fa071b..47d753a 100644
--- a/modules/events-server/docker/docker-compose.yml
+++ b/modules/events-server/docker/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.9"
 services:
 
   events-server:
-    image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/events-server:${KAFKATORIO_VERSION}
-    container_name: events-server
+    image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
+    container_name: ${APP_NAME}
     restart: unless-stopped
     build:
       context: ..
@@ -12,6 +12,7 @@ services:
       args:
         KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
         DIST_DIR: "./build/distributions/"
+        APP_NAME: ${APP_NAME}
     environment:
       KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
       # KAFKA_STREAMS_STATE_DIR: ""
diff --git a/modules/infra-kafka-cluster/build.gradle.kts b/modules/infra-kafka-cluster/build.gradle.kts
index 3f6866b..e5abad0 100644
--- a/modules/infra-kafka-cluster/build.gradle.kts
+++ b/modules/infra-kafka-cluster/build.gradle.kts
@@ -16,6 +16,7 @@ tasks.dockerComposeEnvUpdate {
     put("KAFKA_DL_URL", libs.versions.kafka.map { ver ->
       "https://dlcdn.apache.org/kafka/$ver/kafka_2.13-$ver.tgz"
     })
+    put("APP_NAME", "kafka-kraft")
   }
 
   // Limit JVM Heap Size
diff --git a/modules/infra-kafka-cluster/src/docker-compose.yml b/modules/infra-kafka-cluster/src/docker-compose.yml
index 359f741..10764ad 100644
--- a/modules/infra-kafka-cluster/src/docker-compose.yml
+++ b/modules/infra-kafka-cluster/src/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.9"
 services:
 
   kafka:
-    image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/kafka-kraft:${KAFKA_VERSION}
+    image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
     container_name: "kafka"
     restart: "unless-stopped"
     build:
diff --git a/modules/infra-kafka-pipe/src/docker-compose.yml b/modules/infra-kafka-pipe/src/docker-compose.yml
index 6f34f3a..a564e8a 100644
--- a/modules/infra-kafka-pipe/src/docker-compose.yml
+++ b/modules/infra-kafka-pipe/src/docker-compose.yml
@@ -2,11 +2,13 @@ version: "3.9"
 
 services:
   kafka-pipe:
-    image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/kafka-pipe/${KAFKATORIO_VERSION}
-    container_name: "kafka-pipe"
+    image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
+    container_name: ${APP_NAME}
     build:
       dockerfile: "kafka-pipe.Dockerfile"
       context: "."
+      args:
+        APP_NAME: ${APP_NAME}
     restart: "unless-stopped"
     privileged: true
     networks:
diff --git a/modules/web-map/docker/docker-compose.yml b/modules/web-map/docker/docker-compose.yml
index f779fde..6e5cf80 100644
--- a/modules/web-map/docker/docker-compose.yml
+++ b/modules/web-map/docker/docker-compose.yml
@@ -3,12 +3,14 @@ version: "3.9"
 services:
 
   kafkatorio-web-map:
-    image: ${REGISTRY_HOST}/dev.adamko.kafkatorio/web-map:${KAFKATORIO_VERSION}
-    container_name: kafkatorio-web-map
+    image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
+    container_name: ${APP_NAME}
     restart: unless-stopped
     build:
       context: ".."
       dockerfile: ./docker/Dockerfile
+      args:
+        APP_NAME: ${APP_NAME}
     ports:
       - "12081:80"
     networks: