diff --git a/goreleaser.yml b/goreleaser.yml
index 052a5b207..07d0855cc 100644
--- a/goreleaser.yml
+++ b/goreleaser.yml
@@ -6,21 +6,21 @@ build:
     - windows
   goarch:
     - amd64
-    - 386
+    - "386"
     - arm
     - arm64
   ldflags:
     - -s -w -X github.com/bigmangos/watchtower/internal/meta.Version={{.Version}}
 archives:
-  - name_template: "{{.ProjectName}}_{{.Os}}_{{.Arch}}"
+  - name_template: >-
+      {{- .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "arm" }}armhf
+      {{- else if eq .Arch "arm64" }}arm64v8
+      {{- else if eq .Arch "darwin" }}macOS
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
     format: tar.gz
-    replacements:
-      arm: armhf
-      arm64: arm64v8
-      amd64: amd64
-      386: 386
-      darwin: macOS
-      linux: linux
     format_overrides:
       - goos: windows
         format: zip
@@ -44,7 +44,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/386"
     goos: linux
-    goarch: 386
+    goarch: "386"
     goarm: ''
     dockerfile: dockerfiles/Dockerfile
     image_templates: