diff --git a/src/.goreleaser.yml b/src/.goreleaser.yml
index 79197868..d6756319 100644
--- a/src/.goreleaser.yml
+++ b/src/.goreleaser.yml
@@ -24,6 +24,7 @@ builds:
       - amd64
       - arm64
       - arm
+      - 386
     goarm:
       - "6"
       - "7"
@@ -54,30 +55,15 @@ builds:
 archives:
   - id: archive_multi
     builds: [dynamic]
-    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 }}
+    name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{- if .Arm }}v{{ .Arm }}{{ end }}"
     format: tar.gz
-    format_overrides:
-      - goos: windows
-        format: zip
     wrap_in_directory: true
     files:
       - none*
 
   - id: archive_static
     builds: [static]
-    name_template: >-
-      {{ .ProjectName }}_static_{{ .Version }}_
-      {{- title .Os }}_
-      {{- if eq .Arch "amd64" }}x86_64
-      {{- else if eq .Arch "386" }}i386
-      {{- else }}{{ .Arch }}{{ end }}
-      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    name_template: "{{ .ProjectName }}_static_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{- if .Arm }}v{{ .Arm }}{{ end }}"
     format: tar.gz
     wrap_in_directory: true
     files: