diff --git a/deployments/docker-compose/docker-compose.yaml b/deployments/docker-compose/docker-compose.yaml
index 8cedd52..e6ee7f7 100644
--- a/deployments/docker-compose/docker-compose.yaml
+++ b/deployments/docker-compose/docker-compose.yaml
@@ -77,6 +77,7 @@ services:
   eventstore:
       container_name: eventstore
       image: eventstore/eventstore:latest
+      restart: unless-stopped
       environment:
          - EVENTSTORE_CLUSTER_SIZE=1
          - EVENTSTORE_RUN_PROJECTIONS=All
@@ -168,7 +169,7 @@ services:
     volumes:
       - ./monitoring/grafana-data/data:/var/lib/grafana
     networks:
-      - booking        
+      - booking
 
     #######################################################
     # node_exporter
@@ -185,7 +186,7 @@ services:
       - /sys:/host/sys:ro
       - /:/rootfs:ro
     networks:
-      - booking  
+      - booking
 
     #######################################################
     # cadvisor
@@ -206,7 +207,7 @@ services:
       - /dev/kmsg
     networks:
       - booking
-      
+
   ######################################################
   #  Gateway
   ######################################################
diff --git a/deployments/docker-compose/infrastructure.yaml b/deployments/docker-compose/infrastructure.yaml
index e9ec751..9a17a5b 100644
--- a/deployments/docker-compose/infrastructure.yaml
+++ b/deployments/docker-compose/infrastructure.yaml
@@ -78,6 +78,7 @@ services:
   eventstore:
       container_name: eventstore
       image: eventstore/eventstore:latest
+      restart: unless-stopped
       environment:
          - EVENTSTORE_CLUSTER_SIZE=1
          - EVENTSTORE_RUN_PROJECTIONS=All