diff --git a/README.md b/README.md
index d8e46a6..b137855 100644
--- a/README.md
+++ b/README.md
@@ -349,8 +349,8 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | btcpayserver/dash | 0.16.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) |
 | btcpayserver/dogecoin | 1.14.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.2/Dogecoin/1.14.2/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) |
 | chekaz/docker-feathercoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/feathercoin/0.16.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-feathercoin) |
-| groestlcoin/docker-groestlcoin | 2.20.1 | [✔️](https://raw.githubusercontent.com/NicolasDorier/docker-bitcoin/master/groestlcoin/2.20.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/NicolasDorier/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) |
-| groestlcoin/lightning | v0.9.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) |
+| groestlcoin/docker-groestlcoin | 2.21.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/docker-groestlcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) |
+| groestlcoin/lightning | v0.9.2 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) |
 | groestlcoin/groestlcoin-lightning-charge | version-0.4.22 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-lightning-charge) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-lightning-charge) |
 | groestlcoin/groestlcoin-spark | version-0.2.16 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.16/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-spark) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-spark) |
 | groestlcoin/eclair | v0.3.3 | [✔️](https://raw.githubusercontent.com/Groestlcoin/eclair/v0.3.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/eclair) - [DockerHub](https://hub.docker.com/r/groestlcoin/eclair) |
diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs
index dcfe26c..088586f 100644
--- a/contrib/DockerFileBuildHelper/Program.cs
+++ b/contrib/DockerFileBuildHelper/Program.cs
@@ -463,7 +463,7 @@ namespace DockerFileBuildHelper
                     break;
                 case "docker-groestlcoin":
                     dockerInfo.DockerFilePath = $"groestlcoin/{image.Tag}/Dockerfile";
-                    dockerInfo.GitLink = "https://github.com/NicolasDorier/docker-bitcoin";
+                    dockerInfo.GitLink = "https://github.com/Groestlcoin/docker-groestlcoin";
                     dockerInfo.GitRef = "master";
                     break;
                 case "docker-viacoin":
@@ -560,7 +560,7 @@ namespace DockerFileBuildHelper
                     dockerInfo.GitLink = "https://github.com/apotdevin/thunderhub";
                     dockerInfo.GitRef = $"{image.Tag.Split('-')[1]}";
                     dockerInfo.SupportedByUs = false;
-                    break;                
+                    break;
                 case "python-teos":
                     dockerInfo.DockerFilePath = $"docker/Dockerfile";
                     dockerInfo.DockerFilePathARM32v7 = $"docker/Dockerfile";
diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh
index 88e5270..ede5a01 100644
--- a/contrib/build-all-images.sh
+++ b/contrib/build-all-images.sh
@@ -298,14 +298,14 @@ cd - && cd ..
 
 
 # Build lightning
-# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.0/Dockerfile
+# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.2/Dockerfile
 DOCKERFILE="Dockerfile"
-echo "Building groestlcoin/lightning:v0.9.0"
+echo "Building groestlcoin/lightning:v0.9.2"
 git clone https://github.com/Groestlcoin/lightning lightning
 cd lightning
-git checkout v0.9.0
+git checkout v0.9.2
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v0.9.0" .
+docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v0.9.2" .
 cd - && cd ..
 
 
@@ -358,14 +358,14 @@ cd - && cd ..
 
 
 # Build docker-groestlcoin
-# https://raw.githubusercontent.com/NicolasDorier/docker-bitcoin/master/groestlcoin/2.20.1/Dockerfile
-DOCKERFILE="groestlcoin/2.20.1/Dockerfile"
-echo "Building groestlcoin/docker-groestlcoin:2.20.1"
-git clone https://github.com/NicolasDorier/docker-bitcoin docker-groestlcoin
+# https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.0/Dockerfile
+DOCKERFILE="groestlcoin/2.21.0/Dockerfile"
+echo "Building groestlcoin/docker-groestlcoin:2.21.0"
+git https://github.com/Groestlcoin/docker-groestlcoin docker-groestlcoin
 cd docker-groestlcoin
 git checkout master
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "groestlcoin/docker-groestlcoin:2.20.1" .
+docker build -f "$DOCKERFILE" -t "groestlcoin/docker-groestlcoin:2.21.0" .
 cd - && cd ..
 
 
@@ -841,5 +841,3 @@ git checkout master
 cd "$(dirname $DOCKERFILE)"
 docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" .
 cd - && cd ..
-
-
diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml
index b14d6af..52cd1fd 100644
--- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   clightning_groestlcoin:
-    image: groestlcoin/lightning:v0.9.0
+    image: groestlcoin/lightning:v0.9.2
     stop_signal: SIGKILL
     container_name: btcpayserver_clightning_groestlcoin
     restart: unless-stopped
diff --git a/docker-compose-generator/docker-fragments/groestlcoin.yml b/docker-compose-generator/docker-fragments/groestlcoin.yml
index 4d139eb..11d4195 100644
--- a/docker-compose-generator/docker-fragments/groestlcoin.yml
+++ b/docker-compose-generator/docker-fragments/groestlcoin.yml
@@ -4,7 +4,7 @@ services:
   groestlcoind:
     restart: unless-stopped
     container_name: btcpayserver_groestlcoind
-    image: groestlcoin/docker-groestlcoin:2.20.1
+    image: groestlcoin/docker-groestlcoin:2.21.0
     environment:
       GROESTLCOIN_EXTRA_ARGS: |
         rpcport=43782