diff --git a/Docker/dev/docker-compose.yaml b/Docker/dev/docker-compose.yaml
index 5cae3f5f3..d3b00adf6 100644
--- a/Docker/dev/docker-compose.yaml
+++ b/Docker/dev/docker-compose.yaml
@@ -1,6 +1,7 @@
 services:
   client:
     image: uptime_client:latest
+    restart: always
     ports:
       - "5173:5173"
 
@@ -8,6 +9,7 @@ services:
       - server
   server:
     image: uptime_server:latest
+    restart: always
     ports:
       - "5000:5000"
     env_file:
@@ -17,12 +19,14 @@ services:
       - mongodb
   redis:
     image: uptime_redis:latest
+    restart: always
     ports:
       - "6379:6379"
     volumes:
       - ./redis/data:/data
   mongodb:
     image: uptime_database_mongo:latest
+    restart: always
     command: ["mongod", "--quiet"]
     ports:
       - "27017:27017"
diff --git a/Docker/dist/docker-compose.yaml b/Docker/dist/docker-compose.yaml
index 6d3faaf7f..f12c0979d 100644
--- a/Docker/dist/docker-compose.yaml
+++ b/Docker/dist/docker-compose.yaml
@@ -1,6 +1,7 @@
 services:
   client:
     image: bluewaveuptime/uptime_client:latest
+    restart: always
     environment:
       UPTIME_APP_API_BASE_URL: "http://localhost:5000/api/v1"
     ports:
@@ -10,6 +11,7 @@ services:
       - server
   server:
     image: bluewaveuptime/uptime_server:latest
+    restart: always
     ports:
       - "5000:5000"
     depends_on:
@@ -22,12 +24,14 @@ services:
     # - /var/run/docker.sock:/var/run/docker.sock:ro
   redis:
     image: bluewaveuptime/uptime_redis:latest
+    restart: always
     ports:
       - "6379:6379"
     volumes:
       - ./redis/data:/data
   mongodb:
     image: bluewaveuptime/uptime_database_mongo:latest
+    restart: always
     volumes:
       - ./mongo/data:/data/db
     command: ["mongod", "--quiet"]
diff --git a/Docker/prod/docker-compose.yaml b/Docker/prod/docker-compose.yaml
index e262ef1a2..67bfe42e8 100644
--- a/Docker/prod/docker-compose.yaml
+++ b/Docker/prod/docker-compose.yaml
@@ -1,6 +1,7 @@
 services:
   client:
     image: uptime_client:latest
+    restart: always
     environment:
       UPTIME_APP_API_BASE_URL: "https://checkmate-demo.bluewavelabs.ca/api/v1"
     ports:
@@ -15,11 +16,13 @@ services:
 
   certbot:
     image: certbot/certbot:latest
+    restart: always
     volumes:
       - ./certbot/www/:/var/www/certbot/:rw
       - ./certbot/conf/:/etc/letsencrypt/:rw
   server:
     image: uptime_server:latest
+    restart: always
     ports:
       - "5000:5000"
     env_file:
@@ -29,12 +32,14 @@ services:
       - mongodb
   redis:
     image: uptime_redis:latest
+    restart: always
     ports:
       - "6379:6379"
     volumes:
       - ./redis/data:/data
   mongodb:
     image: uptime_database_mongo:latest
+    restart: always
     command: ["mongod", "--quiet", "--auth"]
     ports:
       - "27017:27017"
diff --git a/Docker/test/docker-compose.yaml b/Docker/test/docker-compose.yaml
index e262ef1a2..434b5ef68 100644
--- a/Docker/test/docker-compose.yaml
+++ b/Docker/test/docker-compose.yaml
@@ -1,6 +1,7 @@
 services:
   client:
     image: uptime_client:latest
+    restart: always
     environment:
       UPTIME_APP_API_BASE_URL: "https://checkmate-demo.bluewavelabs.ca/api/v1"
     ports:
@@ -15,11 +16,13 @@ services:
 
   certbot:
     image: certbot/certbot:latest
+    restart: always
     volumes:
       - ./certbot/www/:/var/www/certbot/:rw
       - ./certbot/conf/:/etc/letsencrypt/:rw
   server:
     image: uptime_server:latest
+    restart: always
     ports:
       - "5000:5000"
     env_file:
@@ -29,6 +32,7 @@ services:
       - mongodb
   redis:
     image: uptime_redis:latest
+    restart: always
     ports:
       - "6379:6379"
     volumes: