diff --git a/modules/events-processors/docker/Dockerfile b/modules/events-processors/docker/Dockerfile
index a081b85..fcc32cc 100644
--- a/modules/events-processors/docker/Dockerfile
+++ b/modules/events-processors/docker/Dockerfile
@@ -3,24 +3,18 @@
 FROM eclipse-temurin:11-jdk-jammy
 ARG KAFKATORIO_VERSION=0.5.1
 ARG DIST_DIR="../build/distributions/"
-ARG APP_NAME="events-server-web"
+ARG APP_NAME="events-processors"
 
 WORKDIR /app
 
-ENV WEB_SERVER_PORT=8080
-EXPOSE $WEB_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
+COPY ${DIST_DIR}/${APP_NAME}-${KAFKATORIO_VERSION}.tar ${APP_NAME}.tar
 
-RUN tar -xf events-server.tar --strip-components=1 \
- && rm events-server.tar
+RUN tar -xf ${APP_NAME}.tar --strip-components=1 \
+ && rm ${APP_NAME}.tar
 
-ENTRYPOINT /app/bin/events-server
+ENTRYPOINT /app/bin/${APP_NAME}
diff --git a/modules/events-processors/docker/docker-compose.yml b/modules/events-processors/docker/docker-compose.yml
index 47d753a..87087e5 100644
--- a/modules/events-processors/docker/docker-compose.yml
+++ b/modules/events-processors/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
 
-  events-server:
+  events-processors:
     image: ${REGISTRY_HOST}/${APP_GROUP}/${APP_NAME}:${KAFKATORIO_VERSION}
     container_name: ${APP_NAME}
     restart: unless-stopped
diff --git a/modules/events-server-syslog/docker/Dockerfile b/modules/events-server-syslog/docker/Dockerfile
index 0f11857..acbdf9f 100644
--- a/modules/events-server-syslog/docker/Dockerfile
+++ b/modules/events-server-syslog/docker/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM openjdk:11
+FROM eclipse-temurin:11-jdk-jammy
 ARG KAFKATORIO_VERSION
 ARG DIST_DIR="../build/distributions/"
 ARG APP_NAME="events-server-syslog"
diff --git a/modules/web-map/build.gradle.kts b/modules/web-map/build.gradle.kts
index f2582c3..7c757d6 100644
--- a/modules/web-map/build.gradle.kts
+++ b/modules/web-map/build.gradle.kts
@@ -138,3 +138,7 @@ val runWebMap by tasks.registering {
 
   dependsOn(tasks.matching { it.name == "browserDevelopmentRun" })
 }
+
+tasks.dockerComposeBuild {
+  dependsOn(tasks.zip)
+}