diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9ef36c8..d12d107 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,6 +60,6 @@ jobs:
         with:
           distribution: goreleaser
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index f2629ee..207309e 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -26,12 +26,13 @@ builds:
     binary: network_exporter
 archives:
   - format: tar.gz
-    name_template: "{{ .ProjectName }}-{{ .Version }}.{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
-    replacements:
-      darwin: macOS
-      linux: Linux
-      windows: Windows
-      amd64: x86_64
+    rlcp: true
+    name_template: >-
+      {{ .ProjectName }}-{{ .Version }}.
+      {{- title .Os }}-
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
     format_overrides:
       - goos: windows
         format: zip
diff --git a/Makefile b/Makefile
index 0932b0c..8f4b99b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ build-push:
 	docker buildx build --push --platform linux/amd64,linux/arm/v7,linux/arm64/v8 -t ${IMAGE_NAME}:${VERSION} .
 
 build-local:
-	goreleaser release --skip-publish --snapshot --rm-dist
+	goreleaser release --skip-publish --snapshot --clean
 
 lint:
 	golangci-lint run