diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
index 6e28886..b3b634b 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
index f5519c0..d49995f 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc.yml b/Production-NoReverseProxy/docker-compose.btc-ltc.yml
index f5193a9..45199e8 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.btc.yml b/Production-NoReverseProxy/docker-compose.btc.yml
index ccdd93d..ebfe11f 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
index c538914..5a128d1 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production-NoReverseProxy/docker-compose.ltc.yml b/Production-NoReverseProxy/docker-compose.ltc.yml
index 76b4bb1..c4253b5 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml
index 8b791d5..1462504 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc-ltc-clightning.yml b/Production/docker-compose.btc-ltc-clightning.yml
index 7e3793a..159408b 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc-ltc.yml b/Production/docker-compose.btc-ltc.yml
index ce97e8d..1766f3e 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.btc.yml b/Production/docker-compose.btc.yml
index 41c55e9..ef8d7cb 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml
index af739c0..ba31a51 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/Production/docker-compose.ltc.yml b/Production/docker-compose.ltc.yml
index de64aaa..a869518 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
     - "49392"
     environment:
diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index 4c11cf4..e1fa060 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
@@ -32,7 +32,8 @@ services:
 
   btcpayserver:
     environment:
-      BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=http://lnd_bitcoin:8080/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;allowinsecure=true"
+      BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=http://lnd_bitcoin:8080/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;allowinsecure=true",
+      BTCPAY_BTCEXTERNALLNDGRPC: "type=lnd-grpc;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon"
     volumes:
       - "lnd_bitcoin_datadir:/etc/lnd_bitcoin"
     links:
diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml
index 1f6564a..d255122 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.57
+    image: nicolasdorier/btcpayserver:1.0.2.58
     expose:
       - "49392"
     environment: