diff --git a/.goreleaser.yml b/.goreleaser.yaml
similarity index 91%
rename from .goreleaser.yml
rename to .goreleaser.yaml
index 5ac434dda..a81a97845 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yaml
@@ -35,6 +35,8 @@ builds:
         goarch: s390x
       - goos: darwin
         goarch: riscv64
+      - goos: windows
+        goarch: "386"
       - goos: windows
         goarch: arm
       - goos: windows
@@ -44,7 +46,8 @@ builds:
       - goos: windows
         goarch: riscv64
     main: ./cmd/helm
-    binary: helm
+    no_unique_dist_dir: true
+    binary: "{{ .Os }}-{{ .Arch }}/helm"
     ldflags:
       - "{{ .Env.LDFLAGS }}"
     flags:
@@ -55,7 +58,6 @@ archives:
   - id: default
     # this name template makes the OS and Arch compatible with the results of uname.
     name_template: >-
-      {{ .ProjectName }}-
       {{- title .Os }}-
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386