diff --git a/misc/dev/docker-compose.autoconf.misc.yml b/misc/dev/docker-compose.autoconf.misc.yml
index ff32e7bd1..ca9a23c7c 100644
--- a/misc/dev/docker-compose.autoconf.misc.yml
+++ b/misc/dev/docker-compose.autoconf.misc.yml
@@ -31,6 +31,7 @@ services:
       - USE_GZIP=yes
       - EXTERNAL_PLUGIN_URLS=https://github.com/bunkerity/bunkerweb-plugins/archive/refs/heads/dev.zip
       - CUSTOM_CONF_MODSEC_CRS_reqbody-rule=SecRuleRemoveById 200002
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -48,6 +49,7 @@ services:
       - bw-docker
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -68,6 +70,7 @@ services:
       - ./configs/server-http/hello.conf:/data/configs/server-http/hello.conf:ro
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -83,6 +86,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -97,6 +101,7 @@ services:
       - MYSQL_PASSWORD=secret
     volumes:
       - bw-db:/var/lib/mysql
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -104,6 +109,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases:
diff --git a/misc/dev/docker-compose.autoconf.ui.misc.yml b/misc/dev/docker-compose.autoconf.ui.misc.yml
index 16de509f1..1f8b8cdae 100644
--- a/misc/dev/docker-compose.autoconf.ui.misc.yml
+++ b/misc/dev/docker-compose.autoconf.ui.misc.yml
@@ -31,6 +31,7 @@ services:
       - USE_GZIP=yes
       - EXTERNAL_PLUGIN_URLS=https://github.com/bunkerity/bunkerweb-plugins/archive/refs/heads/dev.zip
       - CUSTOM_CONF_MODSEC_CRS_reqbody-rule=SecRuleRemoveById 200002
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -48,6 +49,7 @@ services:
       - bw-docker
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -68,6 +70,7 @@ services:
       - ./configs/server-http/hello.conf:/data/configs/server-http/hello.conf:ro
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -83,6 +86,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -106,6 +110,7 @@ services:
       ADMIN_USERNAME: "admin"
       ADMIN_PASSWORD: "P@ssw0rd"
       DEBUG: "1"
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -131,6 +136,7 @@ services:
       - MYSQL_PASSWORD=secret
     volumes:
       - bw-db:/var/lib/mysql
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -138,6 +144,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases:
diff --git a/misc/dev/docker-compose.autoconf.ui.yml b/misc/dev/docker-compose.autoconf.ui.yml
index a7a0e3452..fb2ca5ffe 100644
--- a/misc/dev/docker-compose.autoconf.ui.yml
+++ b/misc/dev/docker-compose.autoconf.ui.yml
@@ -29,6 +29,7 @@ services:
       - DISABLE_DEFAULT_SERVER=yes
       - USE_CLIENT_CACHE=yes
       - USE_GZIP=yes
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -46,6 +47,7 @@ services:
       - bw-docker
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -65,6 +67,7 @@ services:
       - bw-data:/data
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -80,6 +83,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -103,6 +107,7 @@ services:
       ADMIN_USERNAME: "admin"
       ADMIN_PASSWORD: "P@ssw0rd"
       DEBUG: "1"
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -127,6 +132,7 @@ services:
       - MYSQL_PASSWORD=secret
     volumes:
       - bw-db:/var/lib/mysql
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -134,6 +140,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases:
diff --git a/misc/dev/docker-compose.autoconf.wizard.yml b/misc/dev/docker-compose.autoconf.wizard.yml
index 28000e1cf..ff66d9295 100644
--- a/misc/dev/docker-compose.autoconf.wizard.yml
+++ b/misc/dev/docker-compose.autoconf.wizard.yml
@@ -29,6 +29,7 @@ services:
       - USE_CLIENT_CACHE=yes
       - USE_GZIP=yes
       - UI_HOST=http://bw-ui:7000
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -46,6 +47,7 @@ services:
       - bw-docker
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -65,6 +67,7 @@ services:
       - bw-data:/data
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -80,6 +83,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -101,6 +105,7 @@ services:
     environment:
       <<: *env
       DEBUG: "1"
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -118,6 +123,7 @@ services:
       - MYSQL_PASSWORD=secret
     volumes:
       - bw-db:/var/lib/mysql
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -125,6 +131,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases:
diff --git a/misc/dev/docker-compose.autoconf.yml b/misc/dev/docker-compose.autoconf.yml
index af986a608..08a124aa6 100644
--- a/misc/dev/docker-compose.autoconf.yml
+++ b/misc/dev/docker-compose.autoconf.yml
@@ -29,6 +29,7 @@ services:
       - DISABLE_DEFAULT_SERVER=yes
       - USE_CLIENT_CACHE=yes
       - USE_GZIP=yes
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -46,6 +47,7 @@ services:
       - bw-docker
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -65,6 +67,7 @@ services:
       - bw-data:/data
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -80,6 +83,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -94,6 +98,7 @@ services:
       - MYSQL_PASSWORD=secret
     volumes:
       - bw-db:/var/lib/mysql
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -101,6 +106,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases:
diff --git a/misc/dev/docker-compose.misc.yml b/misc/dev/docker-compose.misc.yml
index e78ea58be..ac3c73cfd 100644
--- a/misc/dev/docker-compose.misc.yml
+++ b/misc/dev/docker-compose.misc.yml
@@ -26,6 +26,7 @@ services:
       - REVERSE_PROXY_HOST=http://app1:8080
       - EXTERNAL_PLUGIN_URLS=https://github.com/bunkerity/bunkerweb-plugins/archive/refs/heads/dev.zip
       - CUSTOM_CONF_MODSEC_CRS_reqbody-suppress=SecRuleRemoveById 200002
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -47,6 +48,7 @@ services:
     environment:
       - DOCKER_HOST=tcp://bw-docker:2375
       - LOG_LEVEL=debug
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -62,6 +64,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -69,6 +72,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases:
diff --git a/misc/dev/docker-compose.ui.misc.yml b/misc/dev/docker-compose.ui.misc.yml
index e2928d5b9..dc0b30ef4 100644
--- a/misc/dev/docker-compose.ui.misc.yml
+++ b/misc/dev/docker-compose.ui.misc.yml
@@ -38,6 +38,7 @@ services:
       - app1.example.com_USE_REVERSE_PROXY=yes
       - app1.example.com_REVERSE_PROXY_URL=/
       - app1.example.com_REVERSE_PROXY_HOST=http://app1:8080
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -58,6 +59,7 @@ services:
       - ./configs/server-http/hello.conf:/data/configs/server-http/hello.conf:ro
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -73,6 +75,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -96,6 +99,7 @@ services:
       ADMIN_USERNAME: "admin"
       ADMIN_PASSWORD: "P@ssw0rd"
       DEBUG: "1"
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -113,6 +117,7 @@ services:
       - MYSQL_PASSWORD=secret
     volumes:
       - bw-db:/var/lib/mysql
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -120,6 +125,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases:
diff --git a/misc/dev/docker-compose.ui.yml b/misc/dev/docker-compose.ui.yml
index 82b9d346f..573117632 100644
--- a/misc/dev/docker-compose.ui.yml
+++ b/misc/dev/docker-compose.ui.yml
@@ -35,6 +35,7 @@ services:
       - app1.example.com_USE_REVERSE_PROXY=yes
       - app1.example.com_REVERSE_PROXY_URL=/
       - app1.example.com_REVERSE_PROXY_HOST=http://app1:8080
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -54,6 +55,7 @@ services:
       - bw-data:/data
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -69,6 +71,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -92,6 +95,7 @@ services:
       ADMIN_USERNAME: "admin"
       ADMIN_PASSWORD: "P@ssw0rd"
       DEBUG: "1"
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -109,6 +113,7 @@ services:
       - MYSQL_PASSWORD=secret
     volumes:
       - bw-db:/var/lib/mysql
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -116,6 +121,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases:
diff --git a/misc/dev/docker-compose.wizard.yml b/misc/dev/docker-compose.wizard.yml
index 81a193412..3da2f3d0b 100644
--- a/misc/dev/docker-compose.wizard.yml
+++ b/misc/dev/docker-compose.wizard.yml
@@ -30,6 +30,7 @@ services:
       - app1.example.com_USE_REVERSE_PROXY=yes
       - app1.example.com_REVERSE_PROXY_URL=/
       - app1.example.com_REVERSE_PROXY_HOST=http://app1:8080
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -49,6 +50,7 @@ services:
       - bw-data:/data
     environment:
       <<: *env
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -64,6 +66,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -85,6 +88,7 @@ services:
     environment:
       <<: *env
       DEBUG: "1"
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -102,6 +106,7 @@ services:
       - MYSQL_PASSWORD=secret
     volumes:
       - bw-db:/var/lib/mysql
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -109,6 +114,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases:
diff --git a/misc/dev/docker-compose.yml b/misc/dev/docker-compose.yml
index a785c60ca..5ce613459 100644
--- a/misc/dev/docker-compose.yml
+++ b/misc/dev/docker-compose.yml
@@ -24,6 +24,7 @@ services:
       - USE_REVERSE_PROXY=yes
       - REVERSE_PROXY_URL=/
       - REVERSE_PROXY_HOST=http://app1:8080
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -44,6 +45,7 @@ services:
     environment:
       - DOCKER_HOST=tcp://bw-docker:2375
       - LOG_LEVEL=debug
+    restart: "unless-stopped"
     networks:
       bw-universe:
         aliases:
@@ -59,6 +61,7 @@ services:
     environment:
       - CONTAINERS=1
       - LOG_LEVEL=warning
+    restart: "unless-stopped"
     networks:
       bw-docker:
         aliases:
@@ -66,6 +69,7 @@ services:
 
   app1:
     image: nginxdemos/nginx-hello
+    restart: "unless-stopped"
     networks:
       bw-services:
         aliases: