diff --git a/Makefile b/Makefile
index 45252251d611..adc7583883fb 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ SHELL:=/usr/bin/env bash
 #
 GO_VERSION ?= 1.21
 # GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
-GO_CONTAINER_IMAGE ?= gcr.io/spectro-images-public/golang:${GO_VERSION}-alpine
+GO_CONTAINER_IMAGE ?= gcr.io/spectro-images-public/golang:${BUILDER_GOLANG_VERSION}-alpine
 
 # Use GOPROXY environment variable if set
 GOPROXY := $(shell go env GOPROXY)
@@ -178,7 +178,7 @@ GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN))
 # It is set by Prow GIT_TAG, a git-based tag of the form vYYYYMMDD-hash, e.g., v20210120-v0.3.10-308-gc61521971
 # Fips Flags
 FIPS_ENABLE ?= ""
-BUILDER_GOLANG_VERSION ?= 1.21
+BUILDER_GOLANG_VERSION ?= 1.21.6
 BUILD_ARGS = --build-arg CRYPTO_LIB=${FIPS_ENABLE} --build-arg BUILDER_GOLANG_VERSION=${BUILDER_GOLANG_VERSION}
 
 RELEASE_LOC := release
@@ -932,7 +932,7 @@ release-binary: $(RELEASE_DIR)
 		-e GOARCH=$(GOARCH) \
 		-v "$$(pwd):/workspace$(DOCKER_VOL_OPTS)" \
 		-w /workspace \
-		golang:$(GO_VERSION) \
+		golang:$(BUILDER_GOLANG_VERSION) \
 		go build -a -trimpath -ldflags "$(LDFLAGS) -extldflags '-static'" \
 		-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY)) $(BUILD_PATH)