diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
index 301f3a1..f583cd5 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
@@ -67,7 +67,7 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     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 0a5f9e7..ecbc719 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
@@ -75,7 +75,7 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
@@ -110,7 +110,7 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     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 08d94e4..c4e0dc3 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.btc.yml b/Production-NoReverseProxy/docker-compose.btc.yml
index fc24eb7..9cb41d5 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
index 1552524..6e9ed10 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
@@ -67,7 +67,7 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     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 7f4ccea..01a52f7 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml
index 285783e..e4376ad 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
@@ -109,7 +109,7 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     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 92e60e6..659905e 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
@@ -117,7 +117,7 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
@@ -152,7 +152,7 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     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 6357264..3859bd7 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc.yml b/Production/docker-compose.btc.yml
index 689b5f6..38a20f2 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml
index 4bb352f..2326ab7 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
@@ -109,7 +109,7 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment:
diff --git a/Production/docker-compose.ltc.yml b/Production/docker-compose.ltc.yml
index 7c99b66..c489bae 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
     - "49392"
     environment:
diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index 3854015..02b12dd 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:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     container_name: btcpayserver_clightning_bitcoin
     restart: unless-stopped
     environment:
diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index c503a8f..458323c 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.36
+    image: nicolasdorier/btcpayserver:1.0.2.37
     expose:
       - "49392"
     environment:
diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
index f1a01d4..3d06bb5 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:0.0.0.23
+    image: nicolasdorier/clightning:v0.6
     container_name: btcpayserver_clightning_litecoin
     restart: unless-stopped
     environment: