diff --git a/btcpay-setup.sh b/btcpay-setup.sh
index 79fd939..75edb6b 100755
--- a/btcpay-setup.sh
+++ b/btcpay-setup.sh
@@ -87,6 +87,9 @@ if [ ! -z $BTCPAY_DOCKER_COMPOSE ] && [ ! -z $DOWNLOAD_ROOT ] && [ -z $BTCPAYGEN
 
     if [[ $(dirname $BTCPAY_DOCKER_COMPOSE) == *Production ]]; then
         BTCPAYGEN_REVERSEPROXY='nginx'
+    fi
+	if [[ $(dirname $BTCPAY_DOCKER_COMPOSE) == *Production-Traefik ]]; then
+        BTCPAYGEN_REVERSEPROXY='traefik'
     fi
     if [[ $(dirname $BTCPAY_DOCKER_COMPOSE) == *Production-NoReverseProxy ]]; then
         BTCPAYGEN_REVERSEPROXY='none'
diff --git a/build.ps1 b/build.ps1
index 23ddca3..170d1cf 100755
--- a/build.ps1
+++ b/build.ps1
@@ -1,6 +1,7 @@
 # This script will run docker-compose-generator in a container to generate the yml files
+if (-not ($BTCPAYGEN_DOCKER_IMAGE)) { $BTCPAYGEN_DOCKER_IMAGE = "btcpayserver/docker-compose-generator" }
 
-docker pull btcpayserver/docker-compose-generator
+docker pull $BTCPAYGEN_DOCKER_IMAGE:
 docker run -v "$(Get-Location)\Generated:/app/Generated" `
            -v "$(Get-Location)\docker-compose-generator\docker-fragments:/app/docker-fragments" `
            -e "BTCPAYGEN_CRYPTO1=$BTCPAYGEN_CRYPTO1" `
diff --git a/build.sh b/build.sh
index d86749e..648b3a6 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This script will run docker-compose-generator in a container to generate the yml files
-docker pull btcpayserver/docker-compose-generator
+docker pull ${BTCPAYGEN_DOCKER_IMAGE:-"btcpayserver/docker-compose-generator"}
 docker run -v "$(pwd)/Generated:/app/Generated" \
            -v "$(pwd)/docker-compose-generator/docker-fragments:/app/docker-fragments" \
            -e "BTCPAYGEN_CRYPTO1=$BTCPAYGEN_CRYPTO1" \