diff --git a/README.md b/README.md
index ff0091e..cc59d49 100644
--- a/README.md
+++ b/README.md
@@ -356,7 +356,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) |
 | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) |
 | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) |
-| apotdevin/thunderhub | v0.7.8 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.8/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.8/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.8/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) |
+| apotdevin/thunderhub | v0.7.9 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.9/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) |
 | btcpayserver/docker-woocommerce | 3.0.6-3 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) |
 | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) |
 | traefik | latest | [✔️](https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/containous/traefik-library-image) - [DockerHub](https://hub.docker.com/_/traefik) |
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index c718bd5..29df1a6 100755
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -640,18 +640,18 @@ cd - && cd ..
 
 
 # Build thunderhub
-# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.8/Dockerfile
+# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.9/Dockerfile
 DOCKERFILE="Dockerfile"
-# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.8/arm32v7.Dockerfile
+# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.9/arm32v7.Dockerfile
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile"
-# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.8/arm64v8.Dockerfile
+# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.7.9/arm64v8.Dockerfile
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile"
-echo "Building apotdevin/thunderhub:v0.7.8"
+echo "Building apotdevin/thunderhub:v0.7.9"
 git clone https://github.com/apotdevin/thunderhub thunderhub
 cd thunderhub
-git checkout v0.7.8
+git checkout v0.7.9
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:v0.7.8" .
+docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:v0.7.9" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
index 7118ee8..496b496 100644
--- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml
@@ -26,6 +26,7 @@ services:
         invoicemacaroonpath=/data/invoice.macaroon
         readonlymacaroonpath=/data/readonly.macaroon
         notls=1
+        tlsextradomain=lnd_bitcoin
     ports:
       - "9735:9735"
     expose:
diff --git a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml
index 07a2aeb..9ebe8b7 100644
--- a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml
@@ -2,14 +2,28 @@ version: "3"
 services:
     btcpayserver:
         environment:
-            BTCPAY_EXTERNALSERVICES: "ThunderHub:thub;"
+            BTCPAY_BTCEXTERNALTHUNDERHUB: "server=/thub/;cookiefile=/etc/lnd_bitcoin_thub_datadir/.cookie"
+        volumes:
+            - "lnd_bitcoin_thub_datadir:/etc/lnd_bitcoin_thub_datadir"
     bitcoin_thub:
-        image: apotdevin/thunderhub:v0.7.8
+        image: apotdevin/thunderhub:v0.7.9
         restart: unless-stopped
         environment:
             BASE_PATH: "/thub"
             HODL_KEY: "XQ86AOqw7Of8qMDql901mcZkuHL2nRel5FA9H2Ie4rTLeBKn0VlO5GuXvdVRogWrDOuH5V0E51Qxy9Bo"
+            COOKIE_PATH: "/data/.cookie"
+            SSO_SERVER_URL: "lnd_bitcoin:10009"
+            SSO_MACAROON_PATH: "/etc/lnd"
+            SSO_CERT_PATH: "/etc/lnd/tls.cert"
+            NO_CLIENT_ACCOUNTS: "true"
+            LOG_LEVEL: debug
+        volumes:
+            - "lnd_bitcoin_datadir:/etc/lnd"
+            - "lnd_bitcoin_thub_datadir:/data"
         expose:
             - "3000"
+        command: ["npm", "run", "start:cookie", "--", "/data/.cookie"]
+volumes:
+    lnd_bitcoin_thub_datadir:
 required:
     - "bitcoin-lnd"