diff --git a/.github/workflows/publish-git-remote-entire.yml b/.github/workflows/publish-git-remote-entire.yml
index d5e19be8a7..f5dfc57b4e 100644
--- a/.github/workflows/publish-git-remote-entire.yml
+++ b/.github/workflows/publish-git-remote-entire.yml
@@ -32,8 +32,7 @@ jobs:
           go-version-file: go.mod
 
       # GoReleaser refuses to run untagged. The tag is local to the
-      # runner, never pushed, and deliberately not stamped into the
-      # binary (see the ldflags note in .goreleaser.nonprod.yaml).
+      # runner and never pushed.
       - name: Make a throwaway tag
         run: git tag --force v0.0.0
 
diff --git a/.goreleaser.nonprod.yaml b/.goreleaser.nonprod.yaml
index 5e555c0388..d38f4e4784 100644
--- a/.goreleaser.nonprod.yaml
+++ b/.goreleaser.nonprod.yaml
@@ -29,9 +29,7 @@ builds:
       - arm64
     ldflags:
       - -s -w
-      # No Version stamp: the workflow's throwaway v0.0.0 tag would be
-      # stamped verbatim. versioninfo.Load() falls back to build info,
-      # so the binary still self-reports the commit it was built from.
+      - -X github.com/entireio/cli/cmd/entire/cli/versioninfo.Version=0.0.0+{{.FullCommit}}
       - -X github.com/entireio/cli/cmd/entire/cli/versioninfo.Commit={{.ShortCommit}}
 
 archives: