diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f64f700c9..ccf80245a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -130,10 +130,10 @@ jobs:
           go-version: 1.24.x
 
       - name: Run goreleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
-          version: v1.17.2
+          version: v2
           args: release --clean
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index dcdaf117f..2812468db 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,5 +1,5 @@
-# This is an example goreleaser.yaml file with some sane defaults.
-# Make sure to check the documentation at http://goreleaser.com
+version: 2
+
 builds:
   - env:
       - CGO_ENABLED=0
@@ -18,26 +18,28 @@ builds:
       - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.buildSource=binaryRelease
 
 archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: 32-bit
-      amd64: x86_64
+  - name_template: >-
+      {{- .ProjectName }}_
+      {{- .Version }}_
+      {{- .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}32-bit
+      {{- else if eq .Arch "arm" }}armv6
+      {{- else }}{{ .Arch }}{{ end }}
     format_overrides:
       - goos: windows
-        format: zip
+        formats: [ zip ]
 checksum:
   name_template: 'checksums.txt'
 snapshot:
-  name_template: '{{ .Tag }}-next'
+  version_template: '{{ .Tag }}-next'
 changelog:
   use: github-native
   sort: asc
 brews:
   -
     # Repository to push the tap to.
-    tap:
+    repository:
       owner: jesseduffield
       name: homebrew-lazygit