diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index bb7f076..ff573dc 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -2,19 +2,19 @@ version: "3"
 
 services:
   clightning_bitcoin:
-    image: btcpayserver/lightning:v0.7.0-2
+    image: btcpayserver/lightning:v0.7.0-3
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
       LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
       LIGHTNINGD_CHAIN: btc
       LIGHTNINGD_ALIAS: ${LIGHTNING_ALIAS}
-      LIGHTNINGD_ANNOUNCEADDR: ${BTCPAY_HOST}:9735
-      LIGHTNINGD_NBXPLORER_ROOT: /root/.nbxplorer
+      LIGHTNINGD_ANNOUNCEADDR: ${BTCPAY_HOST}
+      LIGHTNINGD_PORT: 9735
+      LIGHTNINGD_READY_FILE: /root/.nbxplorer/btc_fully_synched
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
-        bind-addr=0.0.0.0:9735
     volumes:
       - "clightning_bitcoin_datadir:/root/.lightning"
       - "bitcoin_datadir:/etc/bitcoin"
diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index b382c36..b314769 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
@@ -2,15 +2,16 @@ version: "3"
 
 services:
   lnd_bitcoin:
-    image: btcpayserver/lnd:v0.5.2-beta-2
+    image: btcpayserver/lnd:v0.5.2-beta-3
     container_name: btcpayserver_lnd_bitcoin
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
-      LND_EXTERNALIP: ${BTCPAY_HOST}:9735
+      LND_EXTERNALIP: ${BTCPAY_HOST}
+      LND_PORT: 9735
       LND_ALIAS: ${LIGHTNING_ALIAS}
       LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}"
-      LND_NBXPLORER_ROOT: /root/.nbxplorer
+      LND_READY_FILE: /root/.nbxplorer/btc_fully_synched
       LND_EXTRA_ARGS: |
         restlisten=0.0.0.0:8080
         rpclisten=127.0.0.1:10008
diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
index d5e870e..678e990 100644
--- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
@@ -2,19 +2,19 @@ version: "3"
 
 services:
   clightning_litecoin:
-    image: btcpayserver/lightning:v0.7.0-2
+    image: btcpayserver/lightning:v0.7.0-3
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
       LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
       LIGHTNINGD_CHAIN: ltc
       LIGHTNINGD_ALIAS: ${LIGHTNING_ALIAS}
-      LIGHTNINGD_ANNOUNCEADDR: ${BTCPAY_HOST}:9735
-      LIGHTNINGD_NBXPLORER_ROOT: /root/.nbxplorer
+      LIGHTNINGD_ANNOUNCEADDR: ${BTCPAY_HOST}
+      LIGHTNINGD_PORT: 9735
+      LIGHTNINGD_READY_FILE: /root/.nbxplorer/ltc_fully_synched
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
-        bind-addr=0.0.0.0:9735
     volumes:
       - "clightning_litecoin_datadir:/root/.lightning"
       - "litecoin_datadir:/etc/litecoin"
diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml
index 28bf536..2a3ddad 100644
--- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-lnd.yml
@@ -2,15 +2,16 @@ version: "3"
 
 services:
   lnd_litecoin:
-    image: btcpayserver/lnd:v0.5.2-beta-2
+    image: btcpayserver/lnd:v0.5.2-beta-3
     container_name: btcpayserver_lnd_litecoin
     restart: unless-stopped
     environment:
       LND_CHAIN: "ltc"
-      LND_EXTERNALIP: ${BTCPAY_HOST}:9735
+      LND_EXTERNALIP: ${BTCPAY_HOST}
+      LND_PORT: 9736
       LND_ALIAS: ${LIGHTNING_ALIAS}
       LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}"
-      LND_NBXPLORER_ROOT: /root/.nbxplorer
+      LND_READY_FILE: /root/.nbxplorer/ltc_fully_synched
       LND_EXTRA_ARGS: |
         restlisten=0.0.0.0:8080
         rpclisten=127.0.0.1:10008
@@ -25,7 +26,7 @@ services:
         noseedbackup=1
         notls=1
     ports:
-      - "9736:9735"
+      - "9736:9736"
     expose:
       - "8080"
       - "9736"
diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml
index c61bb76..64440cf 100644
--- a/docker-compose-generator/docker-fragments/nbxplorer.yml
+++ b/docker-compose-generator/docker-fragments/nbxplorer.yml
@@ -4,12 +4,13 @@ services:
 
   nbxplorer:
     restart: unless-stopped
-    image: nicolasdorier/nbxplorer:2.0.0.17
+    image: nicolasdorier/nbxplorer:2.0.0.19
     expose: 
       - "32838"
     environment:
       NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest}
       NBXPLORER_BIND: 0.0.0.0:32838
+      NBXPLORER_SIGNALFILESDIR: /datadir
     volumes:
       - "nbxplorer_datadir:/datadir"