diff --git a/docker/docker-files/docker-compose-arlas-server.yml b/docker/docker-files/docker-compose-arlas-server.yml
index a9358c0..8a8f3cc 100644
--- a/docker/docker-files/docker-compose-arlas-server.yml
+++ b/docker/docker-files/docker-compose-arlas-server.yml
@@ -4,6 +4,7 @@ services:
   arlas-server:
     image: gisaia/arlas-server:${ARLAS_VERSION:-24.1.2}
     container_name: arlas-server
+    restart: always
     environment:
       - ARLAS_HOST="arlas-server"
       - ARLAS_ELASTIC_NODES=${ARLAS_ELASTIC_NODES:-elasticsearch:9200}
@@ -15,7 +16,7 @@ services:
       - ARLAS_BASE_URI="${ARLAS_BASE_URI:-http://arlas-server:9999/arlas/}"
       - ARLAS_SERVICE_EXPLORE_ENABLE="${ARLAS_SERVICE_EXPLORE_ENABLE:-true}"
     ports:
-      - 19999:9999
+      - 19999:9999 # !EXPOSE!
     healthcheck:
       test: ["CMD","java","HttpHealthcheck.java","http://localhost:9999/admin/healthcheck"]
       interval: 5s
diff --git a/docker/docker-files/docker-compose-elasticsearch.yml b/docker/docker-files/docker-compose-elasticsearch.yml
index 26d07cc..78a9a5c 100644
--- a/docker/docker-files/docker-compose-elasticsearch.yml
+++ b/docker/docker-files/docker-compose-elasticsearch.yml
@@ -4,6 +4,7 @@ services:
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.7.0}
     container_name: elasticsearch
+    restart: always
     environment:
       - discovery.type=single-node
       - cluster.name=docker-cluster
@@ -20,4 +21,4 @@ services:
 #      - /var/lib/elasticsearch:/usr/share/elasticsearch/data
       - ${ELASTIC_DATADIR}:/usr/share/elasticsearch/data
     ports:
-      - 9200:9200
+      - 9200:9200 # !EXPOSE!
diff --git a/docker/docker-files/docker-compose-kafka.yml b/docker/docker-files/docker-compose-kafka.yml
index bee10e3..17e6367 100644
--- a/docker/docker-files/docker-compose-kafka.yml
+++ b/docker/docker-files/docker-compose-kafka.yml
@@ -4,18 +4,21 @@ services:
   zookeeper:
     image: confluentinc/cp-zookeeper:latest
     container_name: "zookeeper"
+    restart: always
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_TICK_TIME: 2000
     ports:
-      - 22181:2181
+      - 22181:2181 # !EXPOSE!
+
   kafka:
     image: confluentinc/cp-kafka:latest
     container_name: "kafka"
+    restart: always
     depends_on:
       - zookeeper
     ports:
-      - 29092:9092
+      - 29092:9092 # !EXPOSE!
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
diff --git a/docker/docker-files/docker-compose.yml b/docker/docker-files/docker-compose.yml
index cae6e70..94de529 100644
--- a/docker/docker-files/docker-compose.yml
+++ b/docker/docker-files/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       dockerfile: ${DOCKERFILE:-docker/docker-files/Dockerfile-package-only}
     image: gisaia/arlas-tagger:${ARLAS_TAGGER_VERSION:-latest}
     container_name: arlas-tagger
+    restart: always
     environment:
       # ES
       - ARLAS_ELASTIC_NODES=${ARLAS_ELASTIC_NODES:-elasticsearch:9200}
@@ -45,7 +46,7 @@ services:
       - ARLAS_CACHE_FACTORY_CLASS="${ARLAS_CACHE_FACTORY_CLASS:-io.arlas.tagger.impl.HazelcastCacheFactory}"
       - ARLAS_CACHE_TIMEOUT="${ARLAS_CACHE_TIMEOUT:-5}"
     ports:
-      - 19998:9998
+      - 19998:9998 # !EXPOSE!
     volumes:
       - ${ARLAS_AUTH_LOCAL_CERT_FILE:-/tmp}:${ARLAS_AUTH_CERT_FILE:-/opt/app/arlas.pem}:ro
     healthcheck: