diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
index 27ec582..ff3c5ac 100644
--- a/Production-NoReverseProxy/docker-compose.btc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
@@ -67,6 +67,7 @@ services:
   clightning_bitcoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_bitcoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
@@ -77,6 +78,8 @@ services:
     volumes:
     - "clightning_bitcoin_datadir:/root/.lightning"
     - "bitcoin_datadir:/etc/bitcoin"
+    ports:
+    - "9735:9735"
     links:
     - bitcoind
 volumes:
diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
index ae52c55..8c7ccb9 100644
--- a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
@@ -75,6 +75,7 @@ services:
   clightning_litecoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_litecoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
@@ -105,6 +106,7 @@ services:
   clightning_bitcoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_bitcoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
@@ -115,6 +117,8 @@ services:
     volumes:
     - "clightning_bitcoin_datadir:/root/.lightning"
     - "bitcoin_datadir:/etc/bitcoin"
+    ports:
+    - "9735:9735"
     links:
     - bitcoind
 volumes:
diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
index 58b1029..04f1194 100644
--- a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
@@ -67,6 +67,7 @@ services:
   clightning_litecoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_litecoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml
index 15f93fb..4b5492b 100644
--- a/Production/docker-compose.btc-clightning.yml
+++ b/Production/docker-compose.btc-clightning.yml
@@ -109,6 +109,7 @@ services:
   clightning_bitcoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_bitcoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
@@ -119,6 +120,8 @@ services:
     volumes:
     - "clightning_bitcoin_datadir:/root/.lightning"
     - "bitcoin_datadir:/etc/bitcoin"
+    ports:
+    - "9735:9735"
     links:
     - bitcoind
 volumes:
diff --git a/Production/docker-compose.btc-ltc-clightning.yml b/Production/docker-compose.btc-ltc-clightning.yml
index 74b7a03..521d56e 100644
--- a/Production/docker-compose.btc-ltc-clightning.yml
+++ b/Production/docker-compose.btc-ltc-clightning.yml
@@ -117,6 +117,7 @@ services:
   clightning_litecoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_litecoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
@@ -147,6 +148,7 @@ services:
   clightning_bitcoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_bitcoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
@@ -157,6 +159,8 @@ services:
     volumes:
     - "clightning_bitcoin_datadir:/root/.lightning"
     - "bitcoin_datadir:/etc/bitcoin"
+    ports:
+    - "9735:9735"
     links:
     - bitcoind
 volumes:
diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml
index 957bf6a..8782ddd 100644
--- a/Production/docker-compose.ltc-clightning.yml
+++ b/Production/docker-compose.ltc-clightning.yml
@@ -109,6 +109,7 @@ services:
   clightning_litecoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_litecoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin
diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
index c99357c..ab88983 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@@ -4,6 +4,7 @@ services:
   clightning_bitcoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_bitcoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin
@@ -14,6 +15,8 @@ services:
     volumes:
       - "clightning_bitcoin_datadir:/root/.lightning"
       - "bitcoin_datadir:/etc/bitcoin"
+    ports:
+      - "9735:9735"
     links:
       - bitcoind
   btcpayserver:
diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
index dfecfbf..1c5e074 100644
--- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
@@ -4,6 +4,7 @@ services:
   clightning_litecoin:
     image: nicolasdorier/clightning
     container_name: btcpayserver_clightning_litecoin
+    restart: always
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin