diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index d1768c59..05f523cd 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -68,9 +68,7 @@ archives:
     files:
       - none*
 checksum:
-  # You can change the name of the checksums file.
-  # Default is `{{ .ProjectName }}_{{ .Version }}_checksums.txt`.
-  name_template: "{{ .ProjectName }}_{{ .Version }}_checksums.txt"
+  name_template: '{{ .ProjectName }}_{{if eq .Env.RELEASE "true"}}{{ .Version }}{{else}}{{ .ShortCommit }}{{end}}_checksums.txt'
 dockers:
   - use: buildx
     goos: linux
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69d183fa..c82cda71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ Contains all the PRs that improved the code without changing the behaviours.
 - [#367](https://github.com/archway-network/archway/pull/367) - use snapshot for non release builds
 - [#372](https://github.com/archway-network/archway/pull/372) - add docker config to release pipeline
 - [#375](https://github.com/archway-network/archway/pull/375) - add missing colon from manifest
+- [#376](https://github.com/archway-network/archway/pull/376) - fix checksum naming
 
 ### Fixed