diff --git a/.goreleaser.yml b/.goreleaser.yml
index 98f8c206..831dea3c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -43,11 +43,12 @@ builds:
 
 archives:
   -
-    name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+    name_template: >-
+            {{ .ProjectName }}-{{ .Version }}-
+            {{- if eq .Os "darwin" }}macos{{- else }}{{ .Os }}{{ end -}}-
+            {{- if eq .Arch "amd64" }}x86_64{{- else }}{{ .Arch }}{{ end -}}
+            {{ if .Arm }}v{{ .Arm }}{{ end -}}
     format: tar.gz
-    replacements:
-      amd64: x86_64
-      darwin: macos
     format_overrides:
       - goos: windows
         format: zip
diff --git a/Makefile b/Makefile
index 0a6bcf0e..e981867d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ build:
 	go build -v -ldflags "-X main.commit=$(GIT_COMMIT) -X main.version=$(GIT_TAG)"
 
 release:
-	goreleaser --skip-publish --rm-dist
+	goreleaser --skip-publish --clean
 
 capdefs:
 	python3 ./gencapdefs.py > ${capdef_file}