diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
index 58a6a96..75203e5 100644
--- a/Production-NoReverseProxy/docker-compose.btc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -63,13 +63,17 @@ services:
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
         whitelist=0.0.0.0/0
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
index 1045401..460e0a3 100644
--- a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -70,14 +70,18 @@ services:
         rpcport=43782
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
         whitelist=0.0.0.0/0
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
@@ -111,13 +115,17 @@ services:
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
         whitelist=0.0.0.0/0
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc.yml b/Production-NoReverseProxy/docker-compose.btc-ltc.yml
index a0a57a8..3f43a3c 100644
--- a/Production-NoReverseProxy/docker-compose.btc-ltc.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-ltc.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -64,10 +64,14 @@ services:
         rpcport=43782
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
         whitelist=0.0.0.0/0
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "litecoin_datadir:/data"
   bitcoind:
@@ -80,9 +84,13 @@ services:
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
         whitelist=0.0.0.0/0
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "bitcoin_datadir:/data"
 volumes:
diff --git a/Production-NoReverseProxy/docker-compose.btc.yml b/Production-NoReverseProxy/docker-compose.btc.yml
index a91fb9d..8df42f2 100644
--- a/Production-NoReverseProxy/docker-compose.btc.yml
+++ b/Production-NoReverseProxy/docker-compose.btc.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -60,9 +60,13 @@ services:
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
         whitelist=0.0.0.0/0
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "bitcoin_datadir:/data"
 volumes:
diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
index 04ebada..e29675f 100644
--- a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -62,14 +62,18 @@ services:
         rpcport=43782
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
         whitelist=0.0.0.0/0
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.ltc.yml b/Production-NoReverseProxy/docker-compose.ltc.yml
index 410e25e..ff13738 100644
--- a/Production-NoReverseProxy/docker-compose.ltc.yml
+++ b/Production-NoReverseProxy/docker-compose.ltc.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -59,10 +59,14 @@ services:
         rpcport=43782
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
         whitelist=0.0.0.0/0
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "litecoin_datadir:/data"
 volumes:
diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml
index 7a58a45..55d4bf5 100644
--- a/Production/docker-compose.btc-clightning.yml
+++ b/Production/docker-compose.btc-clightning.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -105,13 +105,17 @@ services:
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
         whitelist=0.0.0.0/0
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
diff --git a/Production/docker-compose.btc-ltc-clightning.yml b/Production/docker-compose.btc-ltc-clightning.yml
index 984ee55..3f594d6 100644
--- a/Production/docker-compose.btc-ltc-clightning.yml
+++ b/Production/docker-compose.btc-ltc-clightning.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -112,14 +112,18 @@ services:
         rpcport=43782
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
         whitelist=0.0.0.0/0
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
@@ -153,13 +157,17 @@ services:
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
         whitelist=0.0.0.0/0
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
diff --git a/Production/docker-compose.btc-ltc.yml b/Production/docker-compose.btc-ltc.yml
index bdf658e..2452d91 100644
--- a/Production/docker-compose.btc-ltc.yml
+++ b/Production/docker-compose.btc-ltc.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -106,10 +106,14 @@ services:
         rpcport=43782
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
         whitelist=0.0.0.0/0
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "litecoin_datadir:/data"
   bitcoind:
@@ -122,9 +126,13 @@ services:
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
         whitelist=0.0.0.0/0
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "bitcoin_datadir:/data"
 volumes:
diff --git a/Production/docker-compose.btc.yml b/Production/docker-compose.btc.yml
index 6ca058e..3d569ac 100644
--- a/Production/docker-compose.btc.yml
+++ b/Production/docker-compose.btc.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -102,9 +102,13 @@ services:
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
         whitelist=0.0.0.0/0
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "bitcoin_datadir:/data"
 volumes:
diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml
index 5e58b31..157b1be 100644
--- a/Production/docker-compose.ltc-clightning.yml
+++ b/Production/docker-compose.ltc-clightning.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -104,14 +104,18 @@ services:
         rpcport=43782
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
         whitelist=0.0.0.0/0
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
diff --git a/Production/docker-compose.ltc.yml b/Production/docker-compose.ltc.yml
index 7551060..060e9d3 100644
--- a/Production/docker-compose.ltc.yml
+++ b/Production/docker-compose.ltc.yml
@@ -46,7 +46,7 @@ services:
     - nginx-gen
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
     - "49392"
     environment:
@@ -101,10 +101,14 @@ services:
         rpcport=43782
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
         whitelist=0.0.0.0/0
     expose:
     - "43782"
     - "39388"
+    - "28332"
+    - "28333"
     volumes:
     - "litecoin_datadir:/data"
 volumes:
diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index 31403e7..ceda8ec 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   clightning_bitcoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index b4eeedb..18a6bb2 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   lnd_bitcoin:
-    image: btcpayserver/lnd:0.4.2.0.1
+    image: btcpayserver/lnd:0.5-beta
     container_name: btcpayserver_lnd_bitcoin
     restart: unless-stopped
     environment:
@@ -15,10 +15,12 @@ services:
         rpclisten=0.0.0.0:10009
         bitcoin.node=bitcoind
         bitcoind.rpchost=bitcoind:43782
-        bitcoind.zmqpath=tcp://bitcoind:28332
+        bitcoind.zmqpubrawblock=tcp://bitcoind:28332
+        bitcoind.zmqpubrawtx=tcp://bitcoind:28333
         externalip=${BTCPAY_HOST}:9735
         alias=${LIGHTNING_ALIAS}
-        noencryptwallet=1
+        adminmacaroonpath=/data/admin.macaroon
+        noseedbackup=1
         notls=1
     ports:
       - "9735:9735"
diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml
index f23221a..81ec724 100644
--- a/docker-compose-generator/docker-fragments/bitcoin.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin.yml
@@ -11,9 +11,13 @@ services:
           ${NBITCOIN_NETWORK:-regtest}=1
           port=39388
           whitelist=0.0.0.0/0
+          zmqpubrawblock=tcp://0.0.0.0:28332
+          zmqpubrawtx=tcp://0.0.0.0:28333
       expose:
         - "43782"
         - "39388"
+        - "28332" # ZMQ
+        - "28333" # ZMQ
       volumes:
         - "bitcoin_datadir:/data"
   nbxplorer:
diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index b1ffc14..c9ac995 100644
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: nicolasdorier/btcpayserver:1.0.2.105
+    image: nicolasdorier/btcpayserver:1.0.2.106
     expose:
       - "49392"
     environment:
diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
index 602a566..8156e08 100644
--- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   clightning_litecoin:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c
+    image: nicolasdorier/clightning:v0.6.1
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml
index be9ba0e..df68428 100644
--- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-lnd.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   lnd_litecoin:
-    image: btcpayserver/lnd:0.4.2.0.1
+    image: btcpayserver/lnd:0.5-beta
     container_name: btcpayserver_lnd_litecoin
     restart: unless-stopped
     environment:
@@ -13,10 +13,12 @@ services:
         restlisten=0.0.0.0:8080
         litecoin.node=litecoind
         litecoind.rpchost=litecoind:43782
-        litecoind.zmqpath=tcp://litecoind:28332
+        litecoind.zmqpubrawblock=tcp://litecoind:28332
+        litecoind.zmqpubrawtx=tcp://litecoind:28333
         externalip=${BTCPAY_HOST}:9736
         alias=${LIGHTNING_ALIAS}
-        noencryptwallet=1
+        adminmacaroonpath=/data/admin.macaroon
+        noseedbackup=1
         notls=1
     ports:
       - "9736:9735"
diff --git a/docker-compose-generator/docker-fragments/litecoin.yml b/docker-compose-generator/docker-fragments/litecoin.yml
index 3391261..2d2d0b7 100644
--- a/docker-compose-generator/docker-fragments/litecoin.yml
+++ b/docker-compose-generator/docker-fragments/litecoin.yml
@@ -10,10 +10,14 @@ services:
         rpcport=43782
         ${NBITCOIN_NETWORK:-regtest}=1
         port=39388
+        zmqpubrawblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
         whitelist=0.0.0.0/0
     expose:
       - "43782"
       - "39388"
+      - "28332" # ZMQ
+      - "28333" # ZMQ
     volumes:
       - "litecoin_datadir:/data"
   nbxplorer: