diff --git a/docker/docker-compose-db.yaml b/docker/docker-compose-db.yaml
index 00afd3b..89d4416 100644
--- a/docker/docker-compose-db.yaml
+++ b/docker/docker-compose-db.yaml
@@ -3,7 +3,7 @@ services:
   mysql:
     networks:
       ozone-analytics:
-    restart: on-failure
+    restart: unless-stopped
     image: mariadb:10.3
     command: "mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --log-bin --binlog-format=ROW  --server-id=0 --max_connections=1024"
     environment:
@@ -20,7 +20,7 @@ services:
   postgresql:
     networks:
       ozone-analytics:
-    restart: on-failure
+    restart: unless-stopped
     image: postgres:13
     command: postgres -c wal_level=logical -c max_wal_senders=10 -c max_replication_slots=10
     healthcheck:
diff --git a/docker/docker-compose-drill.yaml b/docker/docker-compose-drill.yaml
index 958185b..0d864a8 100644
--- a/docker/docker-compose-drill.yaml
+++ b/docker/docker-compose-drill.yaml
@@ -1,6 +1,7 @@
 version: "3.8"
 services:
   drill:
+    restart: unless-stopped
     networks:
       ozone-analytics:
     image: apache/drill:1.21.1-openjdk-11
diff --git a/docker/docker-compose-kowl.yaml b/docker/docker-compose-kowl.yaml
index 18f1612..902550d 100644
--- a/docker/docker-compose-kowl.yaml
+++ b/docker/docker-compose-kowl.yaml
@@ -5,7 +5,7 @@ services:
     networks:
       - ozone-analytics
     container_name: "kowl"
-    restart: on-failure
+    restart: unless-stopped
     entrypoint: /bin/sh
     command: -c "echo \"$$KOWL_CONFIG_FILE\" > /tmp/config.yml; /app/kowl"
     ports:
diff --git a/docker/docker-compose-minio.yaml b/docker/docker-compose-minio.yaml
index fa2df96..934361a 100644
--- a/docker/docker-compose-minio.yaml
+++ b/docker/docker-compose-minio.yaml
@@ -47,6 +47,7 @@ services:
        ACCESS_KEY: ${MINIO_ROOT_USER}
        ACCESS_SECRET: ${MINIO_ROOT_PASSWORD}
        DATA_BUCKET: analytics
+     restart: unless-stopped
 
 
 volumes:
diff --git a/docker/docker-compose-streaming-common.yaml b/docker/docker-compose-streaming-common.yaml
index 0a3a7a1..447e953 100644
--- a/docker/docker-compose-streaming-common.yaml
+++ b/docker/docker-compose-streaming-common.yaml
@@ -3,7 +3,7 @@ services:
   zookeeper:
     networks:
       ozone-analytics:
-    restart: on-failure
+    restart: unless-stopped
     image: debezium/zookeeper:${DEBEZIUM_VERSION}
     ports:
      - 2181:2181
@@ -15,7 +15,7 @@ services:
     labels: 
       kompose.service.type: clusterip
   kafka:
-    restart: on-failure
+    restart: unless-stopped
     image: debezium/kafka:${DEBEZIUM_VERSION}
     networks:
       ozone-analytics:
@@ -60,7 +60,7 @@ services:
     depends_on:
       - kafka
   connect:
-    restart: on-failure
+    restart: unless-stopped
     image: debezium/connect:${DEBEZIUM_VERSION}
     networks:
       ozone-analytics:
@@ -115,7 +115,7 @@ services:
   jobmanager:
     networks:
       ozone-analytics:
-    restart: on-failure
+    restart: unless-stopped
     image: mekomsolutions/ozone-flink-jobs
     ports:
       - "8084:8081"