diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
index bff13e1..82fb902 100644
--- a/Production-NoReverseProxy/docker-compose.btc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
@@ -67,14 +67,15 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_bitcoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=btc
diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
index d0f5946..f5c00d8 100644
--- a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
@@ -75,15 +75,15 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_litecoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
-        ipaddr=${BTCPAY_HOST}:9736
-        port=9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=ltc
@@ -91,7 +91,7 @@ services:
     - "clightning_litecoin_datadir:/root/.lightning"
     - "litecoin_datadir:/etc/litecoin"
     ports:
-    - "9736:9736"
+    - "9736:9735"
     links:
     - litecoind
   bitcoind:
@@ -110,14 +110,15 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_bitcoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=btc
diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
index 36cd8be..9db7dde 100644
--- a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
@@ -67,15 +67,15 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_litecoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
-        ipaddr=${BTCPAY_HOST}:9736
-        port=9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=ltc
@@ -83,7 +83,7 @@ services:
     - "clightning_litecoin_datadir:/root/.lightning"
     - "litecoin_datadir:/etc/litecoin"
     ports:
-    - "9736:9736"
+    - "9736:9735"
     links:
     - litecoind
 volumes:
diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml
index b61debb..f073779 100644
--- a/Production/docker-compose.btc-clightning.yml
+++ b/Production/docker-compose.btc-clightning.yml
@@ -109,14 +109,15 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_bitcoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=btc
diff --git a/Production/docker-compose.btc-ltc-clightning.yml b/Production/docker-compose.btc-ltc-clightning.yml
index 9d8518f..7daa7ef 100644
--- a/Production/docker-compose.btc-ltc-clightning.yml
+++ b/Production/docker-compose.btc-ltc-clightning.yml
@@ -117,15 +117,15 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_litecoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
-        ipaddr=${BTCPAY_HOST}:9736
-        port=9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=ltc
@@ -133,7 +133,7 @@ services:
     - "clightning_litecoin_datadir:/root/.lightning"
     - "litecoin_datadir:/etc/litecoin"
     ports:
-    - "9736:9736"
+    - "9736:9735"
     links:
     - litecoind
   bitcoind:
@@ -152,14 +152,15 @@ services:
     volumes:
     - "bitcoin_datadir:/data"
   clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_bitcoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=btc
diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml
index e1e9f12..825b435 100644
--- a/Production/docker-compose.ltc-clightning.yml
+++ b/Production/docker-compose.ltc-clightning.yml
@@ -109,15 +109,15 @@ services:
     volumes:
     - "litecoin_datadir:/data"
   clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_litecoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
-        ipaddr=${BTCPAY_HOST}:9736
-        port=9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=ltc
@@ -125,7 +125,7 @@ services:
     - "clightning_litecoin_datadir:/root/.lightning"
     - "litecoin_datadir:/etc/litecoin"
     ports:
-    - "9736:9736"
+    - "9736:9735"
     links:
     - litecoind
 volumes:
diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index 894ac93..75b3eae 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -2,14 +2,15 @@ version: "3"
 
 services:
   clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_bitcoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=btc
diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
index 38b9ff6..c4fb46a 100644
--- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
@@ -2,15 +2,15 @@ version: "3"
 
 services:
   clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.13
     container_name: btcpayserver_clightning_litecoin
     restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
         bitcoin-rpcconnect=litecoind
-        ipaddr=${BTCPAY_HOST}:9736
-        port=9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
         network=${NBITCOIN_NETWORK:-regtest}
         alias=${LIGHTNING_ALIAS}
         chain=ltc
@@ -18,7 +18,7 @@ services:
       - "clightning_litecoin_datadir:/root/.lightning"
       - "litecoin_datadir:/etc/litecoin"
     ports:
-      - "9736:9736"
+      - "9736:9735"
     links:
       - litecoind
   btcpayserver:
diff --git a/generate-docker-compose.sh b/generate-docker-compose.sh
old mode 100644
new mode 100755