diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index e318993c3..64b7605de 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -35,14 +35,16 @@ jobs:
           echo "git describe (dirty): $(git describe --dirty --always --tags)"
           echo "git describe --tags: $(git describe --tags `git rev-list --tags --max-count=1`)"
           echo "git tag: $(git tag --sort=-committerdate | head -n 1)"
+          echo "github_ref: $GITHUB_REF"
           git tag -l
-
       - name: Determine git current SHA and latest tag
         id: git-version
         run: |
           GIT_TAG=$(git tag --sort=-committerdate | head -n 1)
           if [ -n "$GIT_TAG" ]; then
-            GIT_TAG=${GIT_TAG}-SNAPSHOT
+            if [[ "$GITHUB_REF" != refs/tags/* ]]; then
+              GIT_TAG=${GIT_TAG}-SNAPSHOT
+            fi
             echo "GIT_TAG=$GIT_TAG" >> $GITHUB_OUTPUT
           fi
           GIT_SHA=$(git rev-parse --short HEAD)
diff --git a/release/goreleaser.yml b/release/goreleaser.yml
index eb226b7ee..29710357b 100644
--- a/release/goreleaser.yml
+++ b/release/goreleaser.yml
@@ -26,6 +26,7 @@ archives:
   - format_overrides:
       - goos: windows
         format: zip
+    name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
 
 checksum:
   name_template: "{{ .ProjectName }}_checksums.txt"
@@ -36,6 +37,7 @@ snapshot:
 nfpms:
   - id: navidrome
     package_name: navidrome
+    file_name_template: '{{ .PackageName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
 
     homepage: https://navidrome.org
     description: |-