diff --git a/README.md b/README.md
index 06d3f5b..ab3aae0 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.1 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.5.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) |
+| 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) |
 | 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 69a2382..f3e262d 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -546,6 +546,7 @@ namespace DockerFileBuildHelper
                     break;
                 case "thunderhub":
                     dockerInfo.DockerFilePath = $"Dockerfile";
+                    dockerInfo.DockerFilePathARM32v7 = "arm32v7.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 b2e68bf..6e2b5c1 100755
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -640,14 +640,16 @@ cd - && cd ..
 
 
 # Build thunderhub
-# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.5.1/Dockerfile
+# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.5.5/Dockerfile
 DOCKERFILE="Dockerfile"
-echo "Building apotdevin/thunderhub:v0.5.1"
+# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.5.5/arm32v7.Dockerfile
+[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile"
+echo "Building apotdevin/thunderhub:v0.5.5"
 git clone https://github.com/apotdevin/thunderhub thunderhub
 cd thunderhub
-git checkout v0.5.1
+git checkout v0.5.5
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:v0.5.1" .
+docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:v0.5.5" .
 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 77ec47b..454ea2f 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.1
+        image: apotdevin/thunderhub:v0.5.5
         restart: unless-stopped
         environment:
             BASE_PATH: "/thub"