diff --git a/Makefile b/Makefile
index 53ca7d8b8cc..dbf6c6233ce 100644
--- a/Makefile
+++ b/Makefile
@@ -283,7 +283,7 @@ update-mod:
 
 ### Release (intended to be used in the .github/workflows/release.yml)
 $(GORELEASER):
-	go install github.com/goreleaser/goreleaser@latest
+	go install github.com/goreleaser/goreleaser@v1.25.1
 
 .PHONY: release
 release: $(GORELEASER)
diff --git a/build/tools.mk b/build/tools.mk
index 5f04735c398..21ee58c59ff 100644
--- a/build/tools.mk
+++ b/build/tools.mk
@@ -12,10 +12,11 @@ TOOL_DIR     ?= tools
 TOOL_CONFIG  ?= $(TOOL_DIR)/tools.go
 
 TOOLS_IMAGE ?= grafana/tempo-ci-tools
+TOOLS_IMAGE_TAG ?= main-d8c69d4
 
 GOTOOLS ?= $(shell cd $(TOOL_DIR) && go list -e -f '{{ .Imports }}' -tags tools |tr -d '[]')
 
-TOOLS_CMD = docker run --rm -t -v ${PWD}:/tools $(TOOLS_IMAGE)
+TOOLS_CMD = docker run --rm -t -v ${PWD}:/tools $(TOOLS_IMAGE):$(TOOLS_IMAGE_TAG)
 
 .PHONY: tools-image-build
 tools-image-build: