diff --git a/docker-compose-tunnels.yml b/docker-compose-tunnels.yml
index f9c16b6..e6c8a8a 100644
--- a/docker-compose-tunnels.yml
+++ b/docker-compose-tunnels.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   nginx:
     container_name: nginx
-    restart: unless-stopped
+    restart: ${RESTART:-unless-stopped}
     hostname: ${DOMAIN_NAME:?err}
     volumes:
       - './http-root:/var/lib/nginx/html/http-root:ro'
@@ -26,13 +26,13 @@ services:
       - 22000:22000/tcp
       - 22000:22000/udp
       - 21027:21027/udp
-    restart: unless-stopped
+    restart: ${RESTART:-unless-stopped}
 
   cloudflared:
     image: erisamoe/cloudflared
     container_name: cloudflared
     command: --origincert /root/.cloudflared/cert.pem tunnel run --url http://nginx ${DOMAIN_NAME:?err}
-    restart: unless-stopped
+    restart: ${RESTART:-unless-stopped}
     volumes:
       - './data/cloudflared/etc:/etc/cloudflared'
       - './data/cloudflared/home:/root'
diff --git a/docker-compose.yml b/docker-compose.yml
index 38dbebc..8e4fad4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   nginx:
     container_name: nginx
-    restart: unless-stopped
+    restart: ${RESTART:-unless-stopped}
     hostname: ${DOMAIN_NAME:?err}
     volumes:
       - './http-root:/var/lib/nginx/html/http-root:ro'
@@ -35,11 +35,11 @@ services:
       - 22000:22000/tcp
       - 22000:22000/udp
       - 21027:21027/udp
-    restart: unless-stopped
+    restart: ${RESTART:-unless-stopped}
 
   certbot:
     container_name: certbot
-    restart: always
+    restart: ${RESTART:-unless-stopped}
     volumes:
       - './data/acme-webroot:/srv/http/webroot'
       - './data/letsencrypt/etc:/etc/letsencrypt'
diff --git a/run b/run
index 7fecd8d..7acfe11 100755
--- a/run
+++ b/run
@@ -55,8 +55,8 @@ fi
 
 if [ "$USE_TUNNELS" != "true" ]; then
   docker-compose -f docker-compose.yml pull
-  docker-compose -f docker-compose.yml up ${COMPOSEFLAGS:-"-d"}
+  docker-compose -f docker-compose.yml up ${COMPOSEFLAGS-"-d"}
 else
   docker-compose -f docker-compose-tunnels.yml pull
-  docker-compose -f docker-compose-tunnels.yml up ${COMPOSEFLAGS:-"-d"}
+  docker-compose -f docker-compose-tunnels.yml up ${COMPOSEFLAGS-"-d"}
 fi