diff --git a/.goreleaser.yml b/.goreleaser.yml
index 2cddfbc..770dc41 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -33,11 +33,15 @@ builds:
         goarch: 386
 archives:
   -
-    name_template: '{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
-    replacements:
-      darwin: macos
-      386: x86
-      amd64: x64
+    name_template: >-
+      {{- .ProjectName }}-
+      {{- .Version }}-
+      {{- .Os }}-
+      {{- if eq .Arch "amd64" }}x64
+      {{- else if eq .Arch "386" }}x86
+      {{- else if eq .Arch "darwin" }}macos
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end -}}
     files:
       - none*
     format_overrides:
diff --git a/release/build.sh b/release/build.sh
index 20e041a..0f02491 100755
--- a/release/build.sh
+++ b/release/build.sh
@@ -24,7 +24,7 @@ echo 'setting cli version'
 export VERSION="1.2.0"
 
 echo 'Generating artifacts'
-goreleaser --snapshot --skip-publish --rm-dist
+goreleaser --snapshot --skip-publish --clean
 
 # goreleaser generates folder and binary too. Remove unwanted files to keep only
 # relevant files inside dist folder