diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index ceda8ec..86ebf91 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:v0.6.1
+    image: nicolasdorier/clightning:v0.6.1-1
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml
index f23221a..b41f881 100644
--- a/docker-compose-generator/docker-fragments/bitcoin.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin.yml
@@ -4,11 +4,12 @@ services:
   bitcoind:
       restart: unless-stopped
       container_name: btcpayserver_bitcoind
-      image: nicolasdorier/docker-bitcoin:0.16.3
+      image: nicolasdorier/docker-bitcoin:0.17.0
       environment:
+        BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
         BITCOIN_EXTRA_ARGS: |
+          deprecatedrpc=signrawtransaction
           rpcport=43782
-          ${NBITCOIN_NETWORK:-regtest}=1
           port=39388
           whitelist=0.0.0.0/0
       expose:
diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
index 8156e08..1cdc815 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:v0.6.1
+    image: nicolasdorier/clightning:v0.6.1-1
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml
index 98df2c2..d77648d 100644
--- a/docker-compose-generator/docker-fragments/nbxplorer.yml
+++ b/docker-compose-generator/docker-fragments/nbxplorer.yml
@@ -4,7 +4,7 @@ services:
 
   nbxplorer:
     restart: unless-stopped
-    image: nicolasdorier/nbxplorer:1.0.3.4
+    image: nicolasdorier/nbxplorer:1.0.3.5
     expose: 
       - "32838"
     environment: