diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 5c8cbcb4a..56efd4869 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -28,7 +28,7 @@ jobs:
     - uses: goreleaser/goreleaser-action@v4.2.0
       with:
         version: latest
-        args: release --timeout=60m --rm-dist
+        args: release --timeout=60m --clean
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         AUR_PRIVATE_KEY: ${{ secrets.AUR_PRIVATE_KEY }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 777d06ae2..996d994c4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -20,13 +20,18 @@ builds:
   - mips64le
   - ppc64le
 archives:
-- name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}"
-  replacements:
-    darwin: Darwin
-    linux: Linux
-    windows: Windows
-    386: i386
-    amd64: x86_64
+- name_template: >-
+    {{- .Binary }}_
+    {{- .Version }}_
+    {{- .Os }}_
+    {{- if eq .Arch "amd64" }}x86_64
+    {{- else if eq .Arch "386" }}i386
+    {{- else if eq .Arch "darwin" }}MacOS
+    {{- else if eq .Arch "linux" }}Linux
+    {{- else if eq .Arch "windows" }}Windows
+    {{- else }}{{ .Arch }}{{ end }}
+    {{- if .Arm }}v{{ .Arm }}{{ end -}}
+    {{- if .Mips }}_{{ .Mips }}{{ end -}}
 checksum:
   name_template: 'checksums.txt'
 snapshot:
@@ -41,7 +46,7 @@ changelog:
 
 brews:
   - name: opc
-    tap:
+    repository:
       owner: openshift-pipelines
       name: opc
     folder: Formula