diff --git a/docker-compose.yml b/docker-compose.yml
index e488c3b..3ecc1b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ services:
   database:
     build:
       context: ./database
+    restart: unless-stopped
     environment:
       POSTGRES_DB: ${POSTGRES_DB:-plasttrack}
       POSTGRES_USER: ${POSTGRES_USER:-plasttrack}
@@ -17,6 +18,7 @@ services:
   mqtt:
     build:
       context: ./mqtt
+    restart: unless-stopped
     ports:
       - "1883:1883"
       - "9001:9001"
@@ -29,6 +31,7 @@ services:
   backend:
     build:
       context: ./backend
+    restart: unless-stopped
     environment:
       POSTGRES_HOST: database
       POSTGRES_PORT: 5432
@@ -51,6 +54,7 @@ services:
   edge-simulator:
     build:
       context: ./edge-simulator
+    restart: unless-stopped
     environment:
       MQTT_HOST: mqtt
       MQTT_PORT: 1883
@@ -63,6 +67,7 @@ services:
   frontend:
     build:
       context: ./frontend
+    restart: unless-stopped
     environment:
       VITE_API_BASE_URL: ${VITE_API_BASE_URL:-http://localhost:8000}
       VITE_WS_URL: ${VITE_WS_URL:-ws://localhost:8000/ws/dashboard}
@@ -75,6 +80,7 @@ services:
   simulator-ui:
     build:
       context: ./simulator-ui
+    restart: unless-stopped
     environment:
       VITE_API_BASE_URL: ${SIMULATOR_API_BASE_URL:-http://localhost:8000}
       VITE_ALLOWED_HOSTS: ${SIMULATOR_ALLOWED_HOSTS:-localhost,127.0.0.1,simplasttrack.sable.ynsdev.site}