diff --git a/lightningd/Dockerfile b/lightningd/Dockerfile
index dd1952f..18fc887 100644
--- a/lightningd/Dockerfile
+++ b/lightningd/Dockerfile
@@ -27,10 +27,11 @@ RUN apk update && \
       zlib-dev \
       zlib-static
 
-ARG GIT_HASH=bd9494c65be09e6f8ecb3bc49b50a859467a65fe
-RUN git clone --recursive https://github.com/lightning-signer/c-lightning.git /repo && \
+ARG CORE_LIGHTNING_GIT_HASH=bd9494c65be09e6f8ecb3bc49b50a859467a65fe
+ARG CORE_LIGHTNING_REPO=https://github.com/lightning-signer/c-lightning.git
+RUN git clone --recursive $CORE_LIGHTNING_REPO /repo && \
     cd /repo && \
-    git checkout $GIT_HASH && \
+    git checkout $CORE_LIGHTNING_GIT_HASH && \
     ./configure --enable-static --prefix=/usr && \
     make -j $(nproc) && \
     make install
@@ -44,19 +45,21 @@ RUN apk add \
       pkgconf \
       sqlite-dev
 
-ARG GIT_HASH=4f37007f00f1cf41e2ead031ddc4a34ef8dbd9e5
-RUN git clone --recurse-submodules https://github.com/ZmnSCPxj/clboss.git /clboss && \
+ARG CLBOSS_GIT_HASH=4f37007f00f1cf41e2ead031ddc4a34ef8dbd9e5
+ARG CLBOSS_REPO=https://github.com/ZmnSCPxj/clboss.git
+RUN git clone --recurse-submodules $CLBOSS_REPO /clboss && \
     cd /clboss && \
-    git checkout $GIT_HASH && \
+    git checkout $CLBOSS_GIT_HASH && \
     autoreconf -i && \
     ./configure --prefix=/usr && \
     make -j $(nproc) && \
     make install
 
-ARG GIT_HASH=ce078bb74e10b5dea779fcd9fbe77e1d3e72db7a
-RUN git clone https://github.com/lightningd/plugins.git && \
+ARG PLUGINS_GIT_HASH=ce078bb74e10b5dea779fcd9fbe77e1d3e72db7a
+ARG PLUGINS_REPO=https://github.com/lightningd/plugins.git
+RUN git clone $PLUGINS_REPO && \
     cd plugins && \
-    git checkout $GIT_HASH
+    git checkout $PLUGINS_GIT_HASH
 
 # final stage with runtime dependencies and pkgs
 FROM --platform=${TARGETPLATFORM:-${BUILDPLATFORM:-linux/amd64}} alpine:3.18 as runner
diff --git a/txood/Dockerfile b/txood/Dockerfile
index 777b817..5a1b18b 100644
--- a/txood/Dockerfile
+++ b/txood/Dockerfile
@@ -10,10 +10,11 @@ RUN apk update && \
 
 RUN apk add cargo
 
-ARG GIT_HASH=528fa92e5def1b6cc19127f2242137bf6f13550d
-RUN git clone --recurse-submodules https://gitlab.com/lightning-signer/txoo.git && \
+ARG TXOO_GIT_HASH=528fa92e5def1b6cc19127f2242137bf6f13550d
+ARG TXOO_REPO=https://gitlab.com/lightning-signer/txoo.git
+RUN git clone --recurse-submodules $TXOO_REPO && \
     cd txoo && \
-    git checkout $GIT_HASH && \
+    git checkout $TXOO_GIT_HASH && \
     cargo build --release -p txood
 
 # txoo runner