diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index f4d19a967..e7d93d01c 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -63,11 +63,15 @@ archives:
   - id: default
     # this name template makes the OS and Arch compatible with the results of uname.
     name_template: >-
-      {{- title .Os }}-
+      {{- .ProjectName }}-
+      {{- .Version }}-
+      {{- .Os }}-
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
       {{- else }}{{ .Arch }}{{ end }}
-      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    formats:
+      - tar.gz
+      - zip
     files:
       - LICENSE
       - README.md
diff --git a/Makefile b/Makefile
index d05d801e7..5fd5ce1f8 100644
--- a/Makefile
+++ b/Makefile
@@ -186,13 +186,7 @@ build-cross: $(GORELEASER)
 
 .PHONY: dist
 dist:
-	( \
-		cd _dist && \
-		$(DIST_DIRS) cp ../LICENSE {} \; && \
-		$(DIST_DIRS) cp ../README.md {} \; && \
-		$(DIST_DIRS) tar -zcf helm-${VERSION}-{}.tar.gz {} \; && \
-		$(DIST_DIRS) zip -r helm-${VERSION}-{}.zip {} \; \
-	)
+	LDFLAGS='$(LDFLAGS)' $(GORELEASER) release --snapshot --clean
 
 .PHONY: fetch-dist
 fetch-dist: