diff --git a/btcpayserver/stub_btcpay_setup.sh b/btcpayserver/stub_btcpay_setup.sh
index e6ca141..235b80b 100755
--- a/btcpayserver/stub_btcpay_setup.sh
+++ b/btcpayserver/stub_btcpay_setup.sh
@@ -50,7 +50,7 @@ fi
 cd btcpayserver-docker
 
 export BTCPAY_HOST="${BTCPAY_USER_FQDN}"
-export BTCPAY_ANNOUNCEABLE_HOST="${DOMAIN_NAME}"
+export BTCPAY_ANNOUNCEABLE_HOST="${BTCPAY_USER_FQDN}"
 export NBITCOIN_NETWORK="${BITCOIN_CHAIN}"
 export LIGHTNING_ALIAS="${PRIMARY_DOMAIN}"
 export BTCPAYGEN_LIGHTNING="clightning"
@@ -77,13 +77,10 @@ services:
   clightning_bitcoin:
     environment:
       LIGHTNINGD_OPT: |
-        #announce-addr=${BTCPAY_USER_FQDN}
-        #announce-addr-dns=true
+        announce-addr-dns=true
         experimental-websocket-port=9736
         experimental-peer-storage
         experimental-offers
-        #experimental-dual-fund
-        #experimental-onion-messages
     ports:
       - "${CLIGHTNING_WEBSOCKET_PORT}:9736"
     expose:
diff --git a/www/go.sh b/www/go.sh
index 171df48..2dd37fc 100755
--- a/www/go.sh
+++ b/www/go.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 # Create the nginx config file which covers all domainys.