diff --git a/modules/events-server/docker/docker-compose.yml b/modules/events-server/docker/docker-compose.yml
index 02f1f6b..dc29561 100644
--- a/modules/events-server/docker/docker-compose.yml
+++ b/modules/events-server/docker/docker-compose.yml
@@ -5,6 +5,7 @@ services:
   events-server:
     image: kafkatorio/events-server:${KAFKATORIO_VERSION}
     container_name: events-server
+    restart: unless-stopped
     build:
       context: ..
       dockerfile: ./docker/Dockerfile
diff --git a/modules/web-map/docker/docker-compose.yml b/modules/web-map/docker/docker-compose.yml
index ac0793c..6b859e1 100644
--- a/modules/web-map/docker/docker-compose.yml
+++ b/modules/web-map/docker/docker-compose.yml
@@ -5,6 +5,7 @@ services:
   kafkatorio-web-map:
     image: adamko-dev/kafkatorio-web-map
     container_name: kafkatorio-web-map
+    restart: unless-stopped
     build:
       context: ".."
       dockerfile: ./docker/Dockerfile