diff --git a/docker-compose-elasticsearch.yml b/docker-compose-elasticsearch.yml
index 9deefe36f..7b22d3a16 100644
--- a/docker-compose-elasticsearch.yml
+++ b/docker-compose-elasticsearch.yml
@@ -4,6 +4,7 @@ services:
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.11.1}
     container_name: elasticsearch
+    restart: always
     environment:
       - discovery.type=single-node
       - cluster.name=docker-cluster
@@ -16,4 +17,4 @@ services:
 #      - /var/lib/elasticsearch:/usr/share/elasticsearch/data
       - ${ELASTIC_DATADIR}:/usr/share/elasticsearch/data
     ports:
-      - 9200:9200
\ No newline at end of file
+      - 9200:9200 # !EXPOSE!
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 16f077cf0..6a2b9873c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       dockerfile: ${DOCKERFILE:-Dockerfile-package-only}
     image: gisaia/arlas-server:${ARLAS_VERSION:-latest}
     container_name: arlas-server
+    restart: always
     environment:
       - JDK_JAVA_OPTIONS=${ARLAS_JDK_JAVA_OPTIONS:--Xmx1g -XX:+ExitOnOutOfMemoryError}
       - ARLAS_LOGGING_LEVEL="${ARLAS_LOGGING_LEVEL:-INFO}"
@@ -31,7 +32,7 @@ services:
       - ARLAS_CACHE_TIMEOUT="${ARLAS_CACHE_TIMEOUT:-5}"
       - ARLAS_SWAGGER_RESOURCE_PKG="${ARLAS_SWAGGER_RESOURCE_PKG:-io.arlas.server.rest}"
     ports:
-      - 19999:9999
+      - 19999:9999 # !EXPOSE!
     volumes:
       - ${ARLAS_AUTH_LOCAL_CERT_FILE:-/tmp}:${ARLAS_AUTH_CERT_FILE:-/opt/app/arlas.pem}:ro
     healthcheck: