diff --git a/.github/workflows/_goreleaser.yml b/.github/workflows/_goreleaser.yml
index b8df625..55b82d9 100644
--- a/.github/workflows/_goreleaser.yml
+++ b/.github/workflows/_goreleaser.yml
@@ -23,7 +23,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v4
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 0d8992e..53dc142 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -13,8 +13,8 @@ builds:
       - arm64
       - arm
     goarm:
-      - 6
-      - 7
+      - "6"
+      - "7"
     ignore:
       - goos: windows
         goarch: arm
@@ -24,10 +24,15 @@ builds:
     ldflags:
       - -s -w
 archives:
-  - replacements:
-      darwin: macos
-      386: i386
-      amd64: x86_64
+  - rlcp: true
+    name_template: >-
+      {{ .ProjectName }}-
+      {{ .Version }}
+      {{ .Os }}-
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "darwin" }}macos
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
 source:
   enabled: true
   name_template: "{{ .ProjectName }}-{{ .Version }}-sources"
diff --git a/Makefile b/Makefile
index 434040f..8c3e751 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ clean: ###  clean test cache, build files
 .PHONY: build
 build: clean ### builds the project for the setup os/arch combinations
 	$(info: Make: Build)
-	@goreleaser build --rm-dist --snapshot
+	@goreleaser build --clean --snapshot
 
 .PHONY: buildx
 buildx: