diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index aedd77a1a..22bb4e379 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -78,7 +78,7 @@ checksum:
   name_template: 'checksums.txt'
 
 snapshot:
-  version_template: "{{ incpatch .Version }}-next"
+  version_template: "{{ if .Env.GORELEASER_CURRENT_TAG }}{{ .Env.GORELEASER_CURRENT_TAG }}{{ else }}{{ incpatch .Version }}-next{{ end }}"
 
 changelog:
   sort: asc
diff --git a/Makefile b/Makefile
index 5fd5ce1f8..3ee6f9625 100644
--- a/Makefile
+++ b/Makefile
@@ -186,7 +186,11 @@ build-cross: $(GORELEASER)
 
 .PHONY: dist
 dist:
+ifeq ($(VERSION),canary)
+	GORELEASER_CURRENT_TAG=canary LDFLAGS='$(LDFLAGS)' $(GORELEASER) release --snapshot --clean
+else
 	LDFLAGS='$(LDFLAGS)' $(GORELEASER) release --snapshot --clean
+endif
 
 .PHONY: fetch-dist
 fetch-dist: