diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
index 9224e07..9acf9e8 100644
--- a/Production-NoReverseProxy/docker-compose.btc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
@@ -67,10 +67,13 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: btc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
@@ -82,9 +85,11 @@ services:
     volumes:
     - "clightning_bitcoin_datadir:/root/.lightning"
     - "bitcoin_datadir:/etc/bitcoin"
+    - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
     - "9735:9735"
     links:
+    - nbxplorer
     - bitcoind
 volumes:
   postgres_datadir: 
diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
index de2ed04..2c92b7b 100644
--- a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
@@ -75,10 +75,13 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: ltc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
@@ -90,9 +93,11 @@ services:
     volumes:
     - "clightning_litecoin_datadir:/root/.lightning"
     - "litecoin_datadir:/etc/litecoin"
+    - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
     - "9736:9735"
     links:
+    - nbxplorer
     - litecoind
   bitcoind:
     restart: unless-stopped
@@ -110,10 +115,13 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: btc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
@@ -125,9 +133,11 @@ services:
     volumes:
     - "clightning_bitcoin_datadir:/root/.lightning"
     - "bitcoin_datadir:/etc/bitcoin"
+    - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
     - "9735:9735"
     links:
+    - nbxplorer
     - bitcoind
 volumes:
   postgres_datadir: 
diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
index dabba49..98f978f 100644
--- a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
@@ -67,10 +67,13 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: ltc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
@@ -82,9 +85,11 @@ services:
     volumes:
     - "clightning_litecoin_datadir:/root/.lightning"
     - "litecoin_datadir:/etc/litecoin"
+    - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
     - "9736:9735"
     links:
+    - nbxplorer
     - litecoind
 volumes:
   postgres_datadir: 
diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml
index ed0cf4f..89560de 100644
--- a/Production/docker-compose.btc-clightning.yml
+++ b/Production/docker-compose.btc-clightning.yml
@@ -109,10 +109,13 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: btc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
@@ -124,9 +127,11 @@ services:
     volumes:
     - "clightning_bitcoin_datadir:/root/.lightning"
     - "bitcoin_datadir:/etc/bitcoin"
+    - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
     - "9735:9735"
     links:
+    - nbxplorer
     - bitcoind
 volumes:
   nginx_conf: 
diff --git a/Production/docker-compose.btc-ltc-clightning.yml b/Production/docker-compose.btc-ltc-clightning.yml
index 7ea1a59..2d68ccc 100644
--- a/Production/docker-compose.btc-ltc-clightning.yml
+++ b/Production/docker-compose.btc-ltc-clightning.yml
@@ -117,10 +117,13 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: ltc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
@@ -132,9 +135,11 @@ services:
     volumes:
     - "clightning_litecoin_datadir:/root/.lightning"
     - "litecoin_datadir:/etc/litecoin"
+    - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
     - "9736:9735"
     links:
+    - nbxplorer
     - litecoind
   bitcoind:
     restart: unless-stopped
@@ -152,10 +157,13 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: btc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
@@ -167,9 +175,11 @@ services:
     volumes:
     - "clightning_bitcoin_datadir:/root/.lightning"
     - "bitcoin_datadir:/etc/bitcoin"
+    - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
     - "9735:9735"
     links:
+    - nbxplorer
     - bitcoind
 volumes:
   nginx_conf: 
diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml
index c24d760..60a6110 100644
--- a/Production/docker-compose.ltc-clightning.yml
+++ b/Production/docker-compose.ltc-clightning.yml
@@ -109,10 +109,13 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: ltc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
@@ -124,9 +127,11 @@ services:
     volumes:
     - "clightning_litecoin_datadir:/root/.lightning"
     - "litecoin_datadir:/etc/litecoin"
+    - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
     - "9736:9735"
     links:
+    - nbxplorer
     - litecoind
 volumes:
   nginx_conf: 
diff --git a/btcpay-up.sh b/btcpay-up.sh
index 53a1560..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 -d
+docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d
diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index 6448743..b7924f1 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -2,10 +2,13 @@ version: "3"
 
 services:
   clightning_bitcoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: btc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
@@ -17,9 +20,11 @@ services:
     volumes:
       - "clightning_bitcoin_datadir:/root/.lightning"
       - "bitcoin_datadir:/etc/bitcoin"
+      - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
       - "9735:9735"
     links:
+      - nbxplorer
       - bitcoind
   btcpayserver:
     environment:
diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
index b0b38d1..55a14ab 100644
--- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
@@ -2,10 +2,13 @@ version: "3"
 
 services:
   clightning_litecoin:
-    image: nicolasdorier/clightning:v0.6
+    image: nicolasdorier/clightning:aeafe4dbe7d5c61f664c18417698866b0d70252f-2
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
+      LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      LIGHTNINGD_CHAIN: ltc
+      LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
@@ -17,9 +20,11 @@ services:
     volumes:
       - "clightning_litecoin_datadir:/root/.lightning"
       - "litecoin_datadir:/etc/litecoin"
+      - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
       - "9736:9735"
     links:
+      - nbxplorer
       - litecoind
   btcpayserver:
     environment: