diff --git a/modules/events-processors/docker/Dockerfile b/modules/events-processors/docker/Dockerfile
new file mode 100644
index 0000000..3f7ac14
--- /dev/null
+++ b/modules/events-processors/docker/Dockerfile
@@ -0,0 +1,25 @@
+# syntax=docker/dockerfile:1
+
+FROM eclipse-temurin:11-jdk-jammy
+ARG KAFKATORIO_VERSION=0.5.1
+ARG DIST_DIR="../build/distributions/"
+
+WORKDIR /app
+
+ENV SERVER_PORT=8080
+EXPOSE $SERVER_PORT
+
+ENV SOCKET_SERVER_PORT=9002
+EXPOSE $SOCKET_SERVER_PORT
+
+ENV SERVER_DATA_DIR="/app/data"
+ENV KAFKA_STREAMS_STATE_DIR="/app/state/kafka"
+VOLUME ${SERVER_DATA_DIR} \
+       ${KAFKA_STREAMS_STATE_DIR}
+
+COPY ${DIST_DIR}/events-server-${KAFKATORIO_VERSION}.tar events-server.tar
+
+RUN tar -xf events-server.tar --strip-components=1 \
+ && rm events-server.tar
+
+ENTRYPOINT /app/bin/events-server
diff --git a/modules/events-processors/docker/docker-compose.yml b/modules/events-processors/docker/docker-compose.yml
new file mode 100644
index 0000000..d3b16f9
--- /dev/null
+++ b/modules/events-processors/docker/docker-compose.yml
@@ -0,0 +1,39 @@
+version: "3.9"
+
+services:
+
+  events-server:
+    image: kafkatorio/events-server:${KAFKATORIO_VERSION}
+    container_name: events-server
+    restart: unless-stopped
+    build:
+      context: ..
+      dockerfile: ./docker/Dockerfile
+      args:
+        KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
+        DIST_DIR: "./build/distributions/"
+    environment:
+      KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
+      # KAFKA_STREAMS_STATE_DIR: ""
+      SERVER_PORT: "8080"
+      SOCKET_SERVER_PORT: "9002"
+    ports:
+      - "12080:8080" # http and ws
+      - "12034:9002" # syslog socket
+    networks:
+      - "kafka-nw"
+      - "kafkatorio-nw"
+      - "traefik-nw"
+#    labels:
+#      - "traefik.enable=true"
+
+networks:
+  kafka-nw:
+    name: "kafka-nw"
+    external: true
+  kafkatorio-nw:
+    name: "kafkatorio-nw"
+    external: true
+  traefik-nw:
+    name: "traefik-nw"
+    external: true
diff --git a/modules/events-server-syslog/docker/Dockerfile b/modules/events-server-syslog/docker/Dockerfile
index a196e24..46acc9e 100644
--- a/modules/events-server-syslog/docker/Dockerfile
+++ b/modules/events-server-syslog/docker/Dockerfile
@@ -1,11 +1,22 @@
-FROM gradle:7-jdk11 AS build
-COPY --chown=gradle:gradle . /home/gradle/src
-WORKDIR /home/gradle/src
-RUN gradle buildFatJar --no-daemon
-
-
 FROM openjdk:11
-EXPOSE 8080:8080
-RUN mkdir /app
-COPY --from=build /home/gradle/src/build/libs/*.jar /app/ktor-docker-sample.jar
-ENTRYPOINT ["java","-jar","/app/ktor-docker-sample.jar"]
+ARG KAFKATORIO_VERSION
+ARG DIST_DIR="../build/distributions/"
+ARG APP_NAME="events-server-syslog"
+
+WORKDIR /app
+
+ENV SOCKET_SERVER_PORT=601
+EXPOSE $SYSLOG_PORT
+
+ENV SERVER_DATA_DIR="/app/data"
+ENV KAFKA_STREAMS_STATE_DIR="/app/state/kafka"
+
+VOLUME ${SERVER_DATA_DIR} \
+       ${KAFKA_STREAMS_STATE_DIR}
+
+COPY ${DIST_DIR}/${APP_NAME}-${KAFKATORIO_VERSION}.tar ${APP_NAME}.tar
+
+RUN tar -xf ${APP_NAME}.tar --strip-components=1 \
+ && rm ${APP_NAME}.tar
+
+ENTRYPOINT /app/bin/${APP_NAME}
diff --git a/modules/events-server-syslog/docker/docker-compose.yml b/modules/events-server-syslog/docker/docker-compose.yml
new file mode 100644
index 0000000..d3b16f9
--- /dev/null
+++ b/modules/events-server-syslog/docker/docker-compose.yml
@@ -0,0 +1,39 @@
+version: "3.9"
+
+services:
+
+  events-server:
+    image: kafkatorio/events-server:${KAFKATORIO_VERSION}
+    container_name: events-server
+    restart: unless-stopped
+    build:
+      context: ..
+      dockerfile: ./docker/Dockerfile
+      args:
+        KAFKATORIO_VERSION: ${KAFKATORIO_VERSION}
+        DIST_DIR: "./build/distributions/"
+    environment:
+      KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
+      # KAFKA_STREAMS_STATE_DIR: ""
+      SERVER_PORT: "8080"
+      SOCKET_SERVER_PORT: "9002"
+    ports:
+      - "12080:8080" # http and ws
+      - "12034:9002" # syslog socket
+    networks:
+      - "kafka-nw"
+      - "kafkatorio-nw"
+      - "traefik-nw"
+#    labels:
+#      - "traefik.enable=true"
+
+networks:
+  kafka-nw:
+    name: "kafka-nw"
+    external: true
+  kafkatorio-nw:
+    name: "kafkatorio-nw"
+    external: true
+  traefik-nw:
+    name: "traefik-nw"
+    external: true
diff --git a/modules/events-server/docker/Dockerfile b/modules/events-server/docker/Dockerfile
index 3f7ac14..8c87699 100644
--- a/modules/events-server/docker/Dockerfile
+++ b/modules/events-server/docker/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 FROM eclipse-temurin:11-jdk-jammy
-ARG KAFKATORIO_VERSION=0.5.1
+ARG KAFKATORIO_VERSION
 ARG DIST_DIR="../build/distributions/"
 
 WORKDIR /app
diff --git a/modules/infra-kafka-cluster/src/.env b/modules/infra-kafka-cluster/src/.env
deleted file mode 100644
index 2edf2d3..0000000
--- a/modules/infra-kafka-cluster/src/.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Do not edit manually. This file was created with task 'dockerEnvUpdate'
-COMPOSE_PROJECT_NAME=kafkatorio
-GRAFANA_VERSION=8.5.0
-KAFKATORIO_VERSION=0.9.0
-KAFKA_DL_URL=https\://dlcdn.apache.org/kafka/3.2.2/kafka_2.13-3.2.2.tgz
-KAFKA_VERSION=3.2.2
-PROMETHEUS_VERSION=v2.34.0
diff --git a/modules/infra-kafka-pipe/src/.env b/modules/infra-kafka-pipe/src/.env
deleted file mode 100644
index 1eb5f42..0000000
--- a/modules/infra-kafka-pipe/src/.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not edit manually. This file was created with task 'dockerEnvUpdate'
-COMPOSE_PROJECT_NAME=kafkatorio
-KAFKATORIO_VERSION=0.9.0
diff --git a/modules/web-map/docker/.env b/modules/web-map/docker/.env
deleted file mode 100644
index 1eb5f42..0000000
--- a/modules/web-map/docker/.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not edit manually. This file was created with task 'dockerEnvUpdate'
-COMPOSE_PROJECT_NAME=kafkatorio
-KAFKATORIO_VERSION=0.9.0
diff --git a/modules/web-map/docker/Dockerfile b/modules/web-map/docker/Dockerfile
index a4d5eb5..f72c386 100644
--- a/modules/web-map/docker/Dockerfile
+++ b/modules/web-map/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM nginx
 
-COPY ./nginx.conf /etc/nginx/nginx.conf
+COPY ./docker/nginx.conf /etc/nginx/nginx.conf
 
 COPY ./build/distributions /usr/share/nginx/html
diff --git a/modules/web-map/docker/docker-compose.yml b/modules/web-map/docker/docker-compose.yml
index 6b859e1..4527065 100644
--- a/modules/web-map/docker/docker-compose.yml
+++ b/modules/web-map/docker/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.9"
 services:
 
   kafkatorio-web-map:
-    image: adamko-dev/kafkatorio-web-map
+    image: ${REGISTRY_HOST}/adamko-dev/kafkatorio-web-map:${KAFKATORIO_VERSION}
     container_name: kafkatorio-web-map
     restart: unless-stopped
     build: