diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cba309a1a..7aec92898 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -165,8 +165,8 @@ jobs:
       - name: Release snapshot
         uses: goreleaser/goreleaser-action@v6
         with:
-          version: v1.7.0
-          args: release -f=goreleaser-e2e.yaml --snapshot --skip-publish --rm-dist
+          version: v2.4.8
+          args: release -f=goreleaser-e2e.yaml --snapshot --skip=publish --clean
       - name: Install kind and create cluster
         run: >
           curl -Lo ./kind https://kind.sigs.k8s.io/dl/${{ env.KIND_VERSION
diff --git a/.github/workflows/release-snapshot.yaml b/.github/workflows/release-snapshot.yaml
index 4bc0fd23e..a975e9bab 100644
--- a/.github/workflows/release-snapshot.yaml
+++ b/.github/workflows/release-snapshot.yaml
@@ -40,8 +40,8 @@ jobs:
       - name: Release snapshot
         uses: goreleaser/goreleaser-action@v6
         with:
-          version: v1.7.0
-          args: release -f=goreleaser-e2e.yaml --snapshot --skip-publish --rm-dist
+          version: v2.4.8
+          args: release -f=goreleaser-e2e.yaml --snapshot --skip=publish --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COSIGN_EXPERIMENTAL: 1
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b38d2d6c0..ccf2db301 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -116,8 +116,8 @@ jobs:
       - name: Release
         uses: goreleaser/goreleaser-action@v6
         with:
-          version: v1.7.0
-          args: release --rm-dist
+          version: v2.4.8
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COSIGN_EXPERIMENTAL: 1
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 89d7d6005..e28269cec 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -1,3 +1,6 @@
+version: 2
+
+project_name: trivy_operator
 release:
   draft: false
   prerelease: auto
@@ -22,20 +25,22 @@ builds:
     goarm:
       - "7"
 archives:
-  - name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
+  - name_template: >-
+      {{- .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "arm" }}ARM
+      {{- else if eq .Arch "arm64" }}ARM64
+      {{- else }}{{ .Arch }}{{ end }}
     builds:
       - trivy-operator
-    replacements:
-      amd64: x86_64
-      arm: ARM
-      arm64: ARM64
     format_overrides:
       - goos: windows
         format: zip
 checksum:
   name_template: "checksums.txt"
 snapshot:
-  name_template: "{{ .FullCommit }}"
+  version_template: "{{ .FullCommit }}"
 changelog:
   filters:
     exclude:
diff --git a/goreleaser-e2e.yaml b/goreleaser-e2e.yaml
index ebffa8d94..455453076 100644
--- a/goreleaser-e2e.yaml
+++ b/goreleaser-e2e.yaml
@@ -1,4 +1,6 @@
----
+version: 2
+
+project_name: build_e2e
 release:
   draft: false
   prerelease: auto
@@ -26,7 +28,7 @@ archives:
 checksum:
   name_template: checksums.txt
 snapshot:
-  name_template: "{{ .FullCommit }}"
+  version_template: "{{ .FullCommit }}"
 changelog:
   sort: asc
   filters: