diff --git a/agent-node/docker-compose.yml b/agent-node/docker-compose.yml
index a7ddaf3..baed2e2 100644
--- a/agent-node/docker-compose.yml
+++ b/agent-node/docker-compose.yml
@@ -16,4 +16,4 @@
       - CORTEX_SYNC_DIR=/app/sync
     volumes:
       - ./sync:/app/sync
-    restart: unless-stopped
+    restart: always
diff --git a/docker-compose.test-nodes.yml b/docker-compose.test-nodes.yml
index 4ad80ac..209a5fa 100644
--- a/docker-compose.test-nodes.yml
+++ b/docker-compose.test-nodes.yml
@@ -14,7 +14,7 @@
       - AGENT_AUTH_TOKEN=cortex-secret-shared-key
       - AGENT_TLS_ENABLED=false
       - DEBUG_GRPC=true
-    restart: unless-stopped
+    restart: always
     cap_add:
       - NET_ADMIN
     privileged: true
@@ -33,7 +33,7 @@
       - AGENT_AUTH_TOKEN=ysHjZIRXeWo-YYK6EWtBsIgJ4uNBihSnZMtt0BQW3eI
       - AGENT_TLS_ENABLED=false
       - DEBUG_GRPC=true
-    restart: unless-stopped
+    restart: always
     cap_add:
       - NET_ADMIN
     privileged: true
diff --git a/docker-compose.yml b/docker-compose.yml
index f50b281..a380d0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@
   ai-frontend:
     build: ./ui/client-app
     container_name: ai_unified_frontend
-    restart: unless-stopped
+    restart: always
     ports:
       - "8002:80"
     volumes:
@@ -24,7 +24,7 @@
   ai-hub:
     build: ./ai-hub
     container_name: ai_hub_service
-    restart: unless-stopped
+    restart: always
     ports:
       - "50051:50051"
     environment: