diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 10b44c6..b232a6b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,7 +39,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index d6a789c..2a669b1 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -75,11 +75,17 @@ nfpms:
     bindir: /usr/bin
     overrides:
       rpm:
-        replacements:
-          amd64: x86_64
-        file_name_template: "{{ .ProjectName }}-{{ .Version }}.{{ .Arch }}"
+        file_name_template: >-
+          {{ .ProjectName }}-
+          {{- .Version }}.
+          {{- if eq .Arch "amd64" }}x86_64
+          {{- else }}{{ .Arch }}
+          {{- end }}
       deb:
-        file_name_template: "{{ .ProjectName }}-{{ .Version }}_{{ .Arch }}"
+        file_name_template: >-
+          {{ .ProjectName }}-
+          {{- .Version }}_
+          {{- .Arch }}
     vendor:
     homepage: https://github.com/coreruleset/go-ftw
     maintainer: felipe.zipitria@owasp.org