diff --git a/.goreleaser-prerelease.yml b/.goreleaser-prerelease.yml
index 3967d34..b55def5 100644
--- a/.goreleaser-prerelease.yml
+++ b/.goreleaser-prerelease.yml
@@ -26,12 +26,14 @@ builds:
     main: ./cmd/e3dc
     binary: "{{ .ProjectName }}"
 archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
+  - name_template: >-
+      {{- .ProjectName }}_
+      {{- .Version }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end -}}
     format_overrides:
       - goos: windows
         format: zip
diff --git a/.goreleaser.yml b/.goreleaser.yml
index f665db7..cab373d 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -26,12 +26,14 @@ builds:
     main: ./cmd/e3dc
     binary: "{{ .ProjectName }}"
 archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
+  - name_template: >-
+      {{- .ProjectName }}_
+      {{- .Version }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end -}}
     format_overrides:
       - goos: windows
         format: zip