diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 967aafb..d05b26f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: "1.25"
+          cache: false # stdlib-only, no go.sum to key a module cache on
 
       - name: Go build, vet, test
         run: |
@@ -43,6 +44,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: "1.25"
+          cache: false # stdlib-only, no go.sum to key a module cache on
 
       - name: JSON Schema stays in sync with the Go types
         run: go test ./trajectory/ -run "TestSchema" -v
@@ -69,6 +71,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: "1.25"
+          cache: false # stdlib-only, no go.sum to key a module cache on
 
       - name: Build the trazo binary
         run: go build -o trazo ./cmd/trazo
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4032b27..79555b4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,6 +22,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: "1.25"
+          cache: false # stdlib-only, no go.sum for setup-go to key its cache on
 
       - name: Tag matches the compiled-in version
         run: |
diff --git a/Makefile b/Makefile
index 70e4ea5..d78804a 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ dist: ## Build release archives for every target platform
 	  echo "building $$os/$$arch"; \
 	  CGO_ENABLED=0 GOOS=$$os GOARCH=$$arch \
 	    go build -trimpath -o $(DISTDIR)/$(BIN)$$ext $(CMD) || exit 1; \
-	  base=$(BIN)_$(VERSION)_$$os_$$arch; \
+	  base=$(BIN)_$(VERSION)_$${os}_$${arch}; \
 	  if [ $$os = windows ]; then \
 	    (cd $(DISTDIR) && zip -q $$base.zip $(BIN)$$ext && rm $(BIN)$$ext); \
 	  else \