diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 6fff58a..9ea6b37 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -31,10 +31,13 @@ archives:
       - macos
       - linux
     format: zip
-    name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
-    replacements:
-      amd64: x86_64
-      darwin: macos
+    name_template: >-
+      {{ .ProjectName }}_
+      {{- if eq .Os "darwin" }}macos
+      {{- else }}{{ .Os }}{{ end }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
     files:
       - LICENSE.txt
       - CHANGELOG.md
@@ -53,8 +56,12 @@ nfpms:
     homepage: https://github.com/ChrisWiegman/gh-backup
     maintainer: Chris Wiegman <contact@chriswiegman.com>
     description: A simple CLI utility, written in GoLang, to backup all of your public GitHub repos.
-    replacements:
-      amd64: x86_64
+    file_name_template: >-
+      {{ .ProjectName }}_
+      {{-  .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
     formats:
       - apk
       - deb
@@ -62,7 +69,7 @@ nfpms:
       - archlinux
 
 brews:
-  - tap:
+  - repository:
       owner: ChrisWiegman
       name: homebrew-gh-backup
       branch: main
diff --git a/Makefile b/Makefile
index 242bf40..6991a72 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ snapshot:
 	-w /go/src/$(PKG) \
 	goreleaser/goreleaser \
 		release \
-		--rm-dist \
+		--clean \
 		--release-notes=./.changes/$(VERSION).md \
 		--snapshot