diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 12181f7..ec2278b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -29,7 +29,7 @@ jobs:
         with:
           distribution: goreleaser
           version: '~> v1'
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index b06b10e..a7c502f 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -15,12 +15,16 @@ archives:
   - format_overrides:
     - goos: windows
       format: zip
-    replacements:
-      darwin: macOS
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
+    name_template: >-
+      {{- .ProjectName }}_
+      {{- .Tag }}_
+      {{- if eq .Os "darwin" }}macOS
+      {{- else if eq .Os "windows" }}Windows
+      {{- else if eq .Os "linux" }}Linux
+      {{- else }}{{ .Os }}{{ end }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
     files:
     - LICENSE
 checksum: