diff --git a/images/.utils/Earthfile b/images/.utils/Earthfile
index df6582d3d0132f2425ead17bda488e135f63bc87..7ac1aac70018af57388b3be6ce34cd86cc7889cb 100644
--- a/images/.utils/Earthfile
+++ b/images/.utils/Earthfile
@@ -1,4 +1,4 @@
-VERSION 0.7
+VERSION --earthly-git-author-args 0.7
 
 SCAN:
     COMMAND
@@ -10,11 +10,12 @@ SCAN:
 LABEL:
     COMMAND
     ARG image
-    ARG EARTHLY_GIT_CO_AUTHORS
-    ARG EARTHLY_GIT_BRANCH
+    ARG version="main"
+    ARG authors="Sheogorath"
+    ARG source="https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/images/${image}"
     LABEL org.opencontainers.image.title="${image}"
-    LABEL org.opencontainers.image.source="https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/images/${image}"
+    LABEL org.opencontainers.image.source="${source}"
     LABEL org.opencontainers.image.url="https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/images/${image}"
-    LABEL org.opencontainers.image.version="${EARTHLY_GIT_BRANCH}"
-    LABEL org.opencontainers.image.description="Container for ${image} by ${author}"
-    LABEL org.opencontainers.image.authors="${EARTHLY_GIT_CO_AUTHORS}"
\ No newline at end of file
+    LABEL org.opencontainers.image.version="${version}"
+    LABEL org.opencontainers.image.description="Container for ${image} by ${authors}"
+    LABEL org.opencontainers.image.authors="${authors}"
\ No newline at end of file
diff --git a/images/opentf/Earthfile b/images/opentf/Earthfile
index 08de6736c45049687748a8aca6be978c1254c9a9..720e87f0fb9dfe7e9d322fcdceb33b3c04dea8b3 100644
--- a/images/opentf/Earthfile
+++ b/images/opentf/Earthfile
@@ -25,7 +25,7 @@ container-internal:
     COPY +build/tofu /usr/local/bin/opentofu
     COPY +build/tofu /usr/local/bin/opentf
     ENTRYPOINT ["/usr/local/bin/tofu"]
-    DO ../.utils/+LABEL --image=opentf --version=${branch}
+    DO ../.utils/+LABEL --image=opentf --version=${branch} --source=https://github.com/opentofu/opentofu.git
 
 container:
     FROM ../mirror+golang