diff --git a/Earthfile b/Earthfile
index c60ab1d219ed0a2a789e57b710fad2b0f70b3c98..40e0874891e8a05de953e2cadd398c5a7883370a 100644
--- a/Earthfile
+++ b/Earthfile
@@ -1,11 +1,11 @@
 VERSION 0.7
 
-ARG --global CONTAINER_REGISTRY=quay.io/shivering-isles
 
-# Build all container images
+# images builds all container images in the Repository
 images:
-    BUILD +images-earthly
-    BUILD +images-dockerfile
+    ARG CONTAINER_REGISTRY=quay.io/shivering-isles
+    BUILD +images-earthly --CONTAINER_REGISTRY=${CONTAINER_REGISTRY}
+    BUILD +images-dockerfile --CONTAINER_REGISTRY=${CONTAINER_REGISTRY}
 
 images-src:
     FROM quay.io/fedora/fedora:38
@@ -13,17 +13,20 @@ images-src:
 
 images-earthly:
     FROM +images-src
+    ARG CONTAINER_REGISTRY=quay.io/shivering-isles
     FOR dir IN $(find ./images -type d -execdir test -f {}/Earthfile -a \! -e {}/.skip-earthly \; -print)
         BUILD "${dir}+container" --registry="$CONTAINER_REGISTRY/$(basename ${dir})"
     END
 
 images-dockerfile:
     FROM +images-src
+    ARG CONTAINER_REGISTRY=quay.io/shivering-isles
     FOR dir IN $(find ./images -type d -execdir test -f {}/Dockerfile -a \! -e {}/Earthfile -a \! -e {}/.skip-earthly \; -print)
         FROM DOCKERFILE -f "${dir}/Dockerfile" "${dir}"
         SAVE IMAGE "$CONTAINER_REGISTRY/$(basename ${dir})"
     END
 
+# changelog generates a local RELEASENOTES.md file using git-chglog
 changelog:
   FROM quay.io/git-chglog/git-chglog:0.15.4
   COPY . /src
@@ -31,7 +34,7 @@ changelog:
   RUN git-chglog --template .chglog/unreleased.tpl.md --next-tag "v$(date +%y.%m)" --output RELEASENOTES.md
   SAVE ARTIFACT RELEASENOTES.md AS LOCAL RELEASENOTES.md
 
-# Allows to merge branches in the origin remote, this helps to keep everything signed
+# merge allows to merge branches in the origin remote, this helps to keep everything signed
 merge:
     LOCALLY
     ARG --required branch