diff --git a/README.md b/README.md
index 34ec679..eee2b1f 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.5.5 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.5.5/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.5.5/arm32v7.Dockerfile) | ️❌ | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) |
+| apotdevin/thunderhub | v0.6.0 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.6.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.6.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.6.0/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/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs
index f3e262d..98f8822 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -547,6 +547,7 @@ namespace DockerFileBuildHelper
                 case "thunderhub":
                     dockerInfo.DockerFilePath = $"Dockerfile";
                     dockerInfo.DockerFilePathARM32v7 = "arm32v7.Dockerfile";
+                    dockerInfo.DockerFilePathARM64v8 = "arm64v8.Dockerfile";
                     dockerInfo.GitLink = "https://github.com/apotdevin/thunderhub";
                     dockerInfo.GitRef = $"{image.Tag.Split('-')[0]}";
                     dockerInfo.SupportedByUs = false;
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index fb149a6..f3f779a 100755
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -160,12 +160,12 @@ DOCKERFILE="linuxamd64.Dockerfile"
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
 # https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.9.2-beta/linuxarm64v8.Dockerfile
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile"
-echo "Building btcpayserver/lnd:v0.8.2-beta"
+echo "Building btcpayserver/lnd:v0.9.2-beta"
 git clone https://github.com/btcpayserver/lnd lnd
 cd lnd
 git checkout basedon-v0.9.2-beta
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.8.2-beta" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.9.2-beta" .
 cd - && cd ..
 
 
@@ -282,38 +282,38 @@ cd - && cd ..
 
 
 # Build lightning
-# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.8.1/Dockerfile
+# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.8.2/Dockerfile
 DOCKERFILE="Dockerfile"
-echo "Building groestlcoin/lightning:v0.8.1"
+echo "Building groestlcoin/lightning:v0.8.2"
 git clone https://github.com/Groestlcoin/lightning lightning
 cd lightning
-git checkout v0.8.1
+git checkout v0.8.2
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v0.8.1" .
+docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v0.8.2" .
 cd - && cd ..
 
 
 # Build groestlcoin-lightning-charge
-# https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.16/Dockerfile
+# https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.19/Dockerfile
 DOCKERFILE="Dockerfile"
-echo "Building groestlcoin/groestlcoin-lightning-charge:version-0.4.16"
+echo "Building groestlcoin/groestlcoin-lightning-charge:version-0.4.19"
 git clone https://github.com/Groestlcoin/groestlcoin-lightning-charge groestlcoin-lightning-charge
 cd groestlcoin-lightning-charge
-git checkout v0.4.16
+git checkout v0.4.19
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-lightning-charge:version-0.4.16" .
+docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-lightning-charge:version-0.4.19" .
 cd - && cd ..
 
 
 # Build groestlcoin-spark
-# https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.12/Dockerfile
+# https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.14/Dockerfile
 DOCKERFILE="Dockerfile"
-echo "Building groestlcoin/groestlcoin-spark:version-0.2.12"
+echo "Building groestlcoin/groestlcoin-spark:version-0.2.14"
 git clone https://github.com/Groestlcoin/groestlcoin-spark groestlcoin-spark
 cd groestlcoin-spark
-git checkout v0.2.12
+git checkout v0.2.14
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-spark:version-0.2.12" .
+docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-spark:version-0.2.14" .
 cd - && cd ..
 
 
@@ -342,14 +342,14 @@ cd - && cd ..
 
 
 # Build docker-groestlcoin
-# https://raw.githubusercontent.com/NicolasDorier/docker-bitcoin/master/groestlcoin/2.18.2/Dockerfile
-DOCKERFILE="groestlcoin/2.18.2/Dockerfile"
-echo "Building nicolasdorier/docker-groestlcoin:2.18.2"
+# https://raw.githubusercontent.com/NicolasDorier/docker-bitcoin/master/groestlcoin/2.19.1/Dockerfile
+DOCKERFILE="groestlcoin/2.19.1/Dockerfile"
+echo "Building nicolasdorier/docker-groestlcoin:2.19.1"
 git clone https://github.com/NicolasDorier/docker-bitcoin docker-groestlcoin
 cd docker-groestlcoin
 git checkout master
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "nicolasdorier/docker-groestlcoin:2.18.2" .
+docker build -f "$DOCKERFILE" -t "nicolasdorier/docker-groestlcoin:2.19.1" .
 cd - && cd ..
 
 
@@ -392,12 +392,12 @@ DOCKERFILE="linuxamd64.Dockerfile"
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
 # https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.9.2-beta/linuxarm64v8.Dockerfile
 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile"
-echo "Building btcpayserver/lnd:v0.8.2-beta"
+echo "Building btcpayserver/lnd:v0.9.2-beta"
 git clone https://github.com/btcpayserver/lnd lnd
 cd lnd
 git checkout basedon-v0.9.2-beta
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.8.2-beta" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.9.2-beta" .
 cd - && cd ..
 
 
@@ -640,16 +640,18 @@ cd - && cd ..
 
 
 # Build thunderhub
-# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.5.5/Dockerfile
+# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.6.0/Dockerfile
 DOCKERFILE="Dockerfile"
-# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.5.5/arm32v7.Dockerfile
+# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.6.0/arm32v7.Dockerfile
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile"
-echo "Building apotdevin/thunderhub:v0.5.5"
+# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.6.0/arm64v8.Dockerfile
+[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile"
+echo "Building apotdevin/thunderhub:v0.6.0"
 git clone https://github.com/apotdevin/thunderhub thunderhub
 cd thunderhub
-git checkout v0.5.5
+git checkout v0.6.0
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:v0.5.5" .
+docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:v0.6.0" .
 cd - && cd ..
 
 
diff --git a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml
index 454ea2f..46b4837 100644
--- a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml
+++ b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml
@@ -2,9 +2,9 @@ version: "3"
 services:
     btcpayserver:
         environment:
-            BTCPAY_EXTERNALSERVICES: "Thunderhub:thub;"
+            BTCPAY_EXTERNALSERVICES: "ThunderHub:thub;"
     bitcoin_thub:
-        image: apotdevin/thunderhub:v0.5.5
+        image: apotdevin/thunderhub:v0.6.0
         restart: unless-stopped
         environment:
             BASE_PATH: "/thub"