diff --git a/images/opentf/.gitignore b/images/opentf/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..244d99ba84bd20de332be88946437fa90cb8b17a
--- /dev/null
+++ b/images/opentf/.gitignore
@@ -0,0 +1 @@
+tofu
\ No newline at end of file
diff --git a/images/opentf/Earthfile b/images/opentf/Earthfile
index 720e87f0fb9dfe7e9d322fcdceb33b3c04dea8b3..c77863cb180447462d0584b3d747edd2ef05459b 100644
--- a/images/opentf/Earthfile
+++ b/images/opentf/Earthfile
@@ -16,7 +16,7 @@ build:
     RUN go mod download && go mod verify
     COPY +src/src/ ./
     RUN go build -ldflags "-s -w" -mod=readonly -trimpath ./cmd/tofu
-    SAVE ARTIFACT ./tofu ./tofu
+    SAVE ARTIFACT ./tofu ./tofu AS LOCAL ./tofu
 
 container-internal:
     FROM ../mirror+distroless-static
@@ -34,10 +34,10 @@ container:
     ARG tag=$(awk -F'=' '$1 == "release" {print $2}' .release)
     ARG latest=false
     IF [ $latest = "true" ]
-        FROM +container-internal --branch=v${tag}
+        FROM +container-internal --branch=v$(awk -F'=' '$1 == "release" {print $2}' .release)
         SAVE IMAGE --push ${registry}:latest
     ELSE
-        FROM +container-internal --branch=v${tag}
+        FROM +container-internal --branch=v$(awk -F'=' '$1 == "release" {print $2}' .release)
         LABEL "quay.expires-after"="12w"
     END
     SAVE IMAGE --push ${registry}:${tag}