diff --git a/README.md b/README.md
index 55c258f09..a1803b4af 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,7 @@ Check out this video if you're interested in learning more about setting up [BTC
 * `BTCPAYGEN_EXCLUDE_FRAGMENTS`:  Semicolon-separated list of fragments you want to forcefully exclude (eg. `litecoin-clightning`)
 * `TOR_RELAY_NICKNAME`: If tor relay is activated with opt-add-tor-relay, the relay nickname
 * `TOR_RELAY_EMAIL`: If tor relay is activated with opt-add-tor-relay, the email for Tor to contact you regarding your relay
+* `COMPOSE_HTTP_TIMEOUT`: Timeout (in seconds) for `docker compose` command. Defaults to 180 seconds.
 
 Additionally, there are specific environment variables for some addons:
 
diff --git a/btcpay-setup.sh b/btcpay-setup.sh
index 1aa65f88e..2e9c308ed 100755
--- a/btcpay-setup.sh
+++ b/btcpay-setup.sh
@@ -116,7 +116,7 @@ START=""
 HAS_DOCKER=true
 STARTUP_REGISTER=true
 SYSTEMD_RELOAD=true
-while (( "$#" )); do
+while (( $# )); do
   case "$1" in
     -i)
       START=true
@@ -206,6 +206,7 @@ fi
 : "${BTCPAY_ENABLE_SSH:=false}"
 : "${PIHOLE_SERVERIP:=}"
 : "${CLOUDFLARE_TUNNEL_TOKEN:=}"
+: "${COMPOSE_HTTP_TIMEOUT:=180}"
 
 OLD_BTCPAY_DOCKER_COMPOSE="$BTCPAY_DOCKER_COMPOSE"
 ORIGINAL_DIRECTORY="$(pwd)"
@@ -272,7 +273,7 @@ if [[ "${BTCPAYGEN_ADDITIONAL_FRAGMENTS}" == *opt-txindex* ]] && \
 fi
 
 cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"
-. helpers.sh
+. ./helpers.sh
 btcpay_expand_variables
 
 cd "$ORIGINAL_DIRECTORY"
@@ -346,7 +347,7 @@ fi
 touch "$BASH_PROFILE_SCRIPT"
 echo "
 #!/bin/bash
-export COMPOSE_HTTP_TIMEOUT=\"180\"
+export COMPOSE_HTTP_TIMEOUT=\"$COMPOSE_HTTP_TIMEOUT\"
 export BTCPAYGEN_OLD_PREGEN=\"$BTCPAYGEN_OLD_PREGEN\"
 export BTCPAYGEN_CRYPTO1=\"$BTCPAYGEN_CRYPTO1\"
 export BTCPAYGEN_CRYPTO2=\"$BTCPAYGEN_CRYPTO2\"
diff --git a/helpers.sh b/helpers.sh
index 8bd16bc97..84bf0f610 100755
--- a/helpers.sh
+++ b/helpers.sh
@@ -128,7 +128,8 @@ LIT_PASSWD=$LIT_PASSWD
 TALLYCOIN_APIKEY=$TALLYCOIN_APIKEY
 TALLYCOIN_PASSWD=$TALLYCOIN_PASSWD
 TALLYCOIN_PASSWD_CLEARTEXT=$TALLYCOIN_PASSWD_CLEARTEXT
-CLOUDFLARE_TUNNEL_TOKEN=$CLOUDFLARE_TUNNEL_TOKEN" > $BTCPAY_ENV_FILE
+CLOUDFLARE_TUNNEL_TOKEN=$CLOUDFLARE_TUNNEL_TOKEN
+COMPOSE_HTTP_TIMEOUT=$COMPOSE_HTTP_TIMEOUT" > $BTCPAY_ENV_FILE
 
 env | grep ^BWT_ >> $BTCPAY_ENV_FILE || true
 }