diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 139275f599ffdc0cc0583908cf2e5df5eab83341..b2b629c652a43bcb33ef22cfdd41e9e9e151706c 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -2,23 +2,19 @@ version: '3.8'
 services:
   rabbitmq__local:
     image: rabbitmq:management
+    restart: unless-stopped
     ports:
       - "5672:5672"
       # - "15672:15672" # Admin web console
     expose:
       - "5672"
-    healthcheck:
-      test: ["CMD", "rabbitmq-diagnostics", "-q", "ping"]
-      interval: 5s
-      timeout: 20s
-      retries: 3
     container_name: rmq
 
   soar_bus:
     build:
       context: ..
       dockerfile: docker/Dockerfile
-    restart: on-failure
+    restart: unless-stopped
     depends_on:
       - rabbitmq__local
     environment:
@@ -29,12 +25,15 @@ services:
     build:
       context: ..
       dockerfile: docker/Dockerfile
+    restart: unless-stopped
     ports:
       - "8087:8087"
     expose:
       - "8087"
-    command: "api.py"
+    depends_on:
+      - rabbitmq__local
     environment:
       - MQ_HOST=${MQ_HOST}
     volumes:
-      - ${DATA_DIR}/data:/data
\ No newline at end of file
+      - ${DATA_DIR}/data:/data
+    command: "api.py"
\ No newline at end of file