diff --git a/btcpay-down.sh b/btcpay-down.sh
index 392631d..75dde3e 100755
--- a/btcpay-down.sh
+++ b/btcpay-down.sh
@@ -3,4 +3,4 @@
 . /etc/profile.d/btcpay-env.sh
 
 cd "`dirname $BTCPAY_ENV_FILE`"
-docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t 180
+docker-compose -f $BTCPAY_DOCKER_COMPOSE down
diff --git a/btcpay-restart.sh b/btcpay-restart.sh
index 3d83ac1..76e227c 100755
--- a/btcpay-restart.sh
+++ b/btcpay-restart.sh
@@ -3,5 +3,5 @@
 . /etc/profile.d/btcpay-env.sh
 
 cd "`dirname $BTCPAY_ENV_FILE`" 
-docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t 180
-docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d -t 180
+docker-compose -f $BTCPAY_DOCKER_COMPOSE down 
+docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d
diff --git a/btcpay-setup.sh b/btcpay-setup.sh
index ca3beb9..f5756d4 100755
--- a/btcpay-setup.sh
+++ b/btcpay-setup.sh
@@ -270,9 +270,9 @@ Requires=docker.service network-online.target
 Type=oneshot
 RemainAfterExit=yes
 
-ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d -t 180'
+ExecStart=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d'
 ExecStop=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" stop'
-ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" restart -t 180'
+ExecReload=/bin/bash -c '. /etc/profile.d/btcpay-env.sh && cd \"\$(dirname \$BTCPAY_ENV_FILE)\" && docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" restart'
 
 [Install]
 WantedBy=multi-user.target" > /etc/systemd/system/btcpayserver.service
@@ -299,7 +299,7 @@ stop on runlevel [!2345]
 script
     . /etc/profile.d/btcpay-env.sh
     cd \"\$(dirname \$BTCPAY_ENV_FILE)\"
-    docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d -t 180
+    docker-compose -f \"\$BTCPAY_DOCKER_COMPOSE\" up -d
 end script" > /etc/init/start_containers.conf
     echo -e "BTCPay Server upstart configured in /etc/init/start_containers.conf\n"
     initctl reload-configuration
@@ -313,7 +313,7 @@ if [ ! -z "$OLD_BTCPAY_DOCKER_COMPOSE" ] && [ "$OLD_BTCPAY_DOCKER_COMPOSE" != "$
     docker-compose -f "$OLD_BTCPAY_DOCKER_COMPOSE" down
 fi
 
-docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d --remove-orphans -t 180
+docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d --remove-orphans
 
 # Give SSH key to BTCPay
 if [[ -f "$BTCPAY_HOST_SSHKEYFILE" ]]; then
diff --git a/btcpay-up.sh b/btcpay-up.sh
index d3e6c28..4a799ca 100755
--- a/btcpay-up.sh
+++ b/btcpay-up.sh
@@ -3,4 +3,4 @@
 . /etc/profile.d/btcpay-env.sh
 
 cd "`dirname $BTCPAY_ENV_FILE`"
-docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d -t 180
+docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d
diff --git a/btcpay-update.sh b/btcpay-update.sh
index 361f2fe..895766b 100755
--- a/btcpay-update.sh
+++ b/btcpay-update.sh
@@ -36,4 +36,4 @@ for scriptname in *.sh; do
 done
 
 cd "`dirname $BTCPAY_ENV_FILE`"
-docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d --remove-orphans -t 180
+docker-compose -f $BTCPAY_DOCKER_COMPOSE up -d --remove-orphans
diff --git a/changedomain.sh b/changedomain.sh
index e871450..adde316 100755
--- a/changedomain.sh
+++ b/changedomain.sh
@@ -20,5 +20,5 @@ echo "BTCPAY_HOST=$BTCPAY_HOST" >> "$BTCPAY_ENV_FILE"
 echo "ACME_CA_URI=$ACME_CA_URI" >> "$BTCPAY_ENV_FILE"
 
 cd "`dirname $BTCPAY_ENV_FILE`"
-docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d -t 180
+docker-compose -f "$BTCPAY_DOCKER_COMPOSE" up -d
 fi
diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index 05a3db6..5138b20 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -3,7 +3,6 @@ version: "3"
 services:
   clightning_bitcoin:
     image: nicolasdorier/clightning:v0.6.2-3
-    stop_signal: SIGKILL
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
index d5e70d8..194f727 100644
--- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
@@ -3,7 +3,6 @@ version: "3"
 services:
   clightning_litecoin:
     image: nicolasdorier/clightning:v0.6.2-3
-    stop_signal: SIGKILL
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment: