diff --git a/Makefile b/Makefile
index bf2f461..0ebb48b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,12 +20,12 @@
 GO_JUNIT_REPORT_VERSION         ?= "1.0.0"
 GOCOVER_COBERTURA_VERSION       ?= "v0.0.0-20180217150009-aaee18c8195c"
 GOLANG_VERSION                  ?= "1.25.3"
-GOLANG_VERSION_FOR_PROTOC       ?= "1.16.3"
 GOLANGCI_LINT_VERSION           ?= "2.5.0"
 HADOLINT_VERSION                ?= "2.12.0"
-PROTOC_VERSION                  ?= "3.7.0"
-PROTOC_SHA256SUM                ?= "a1b8ed22d6dc53c5b8680a6f1760a305b33ef471bece482e92728f00ba2a2969"
-PROTOC_GEN_GO_VERSION           ?= "1.3.2"
+PROTOC_VERSION                  ?= "25.8"
+PROTOC_SHA256SUM                ?= "f7873a2b57811575c661faffa847e0e9b1bb06a1aea5021eccb05e8c04b260d5"
+PROTOC_GEN_GO_VERSION           ?= "1.36.11"
+PROTOC_GEN_GO_GRPC_VERSION      ?= "1.6.0"
 PROTOC_GEN_GRPC_GATEWAY_VERSION ?= "1.14.3"
 PROTOC_GEN_CPP_VERSION          ?= "1.31.1"
 
@@ -117,10 +117,11 @@
 
 protoc:
 	${DOCKER} build ${DOCKER_BUILD_ARGS} \
-	--build-arg GOLANG_VERSION=${GOLANG_VERSION_FOR_PROTOC} \
+	--build-arg GOLANG_VERSION=${GOLANG_VERSION} \
 	--build-arg PROTOC_VERSION=${PROTOC_VERSION} \
 	--build-arg PROTOC_SHA256SUM=${PROTOC_SHA256SUM} \
 	--build-arg PROTOC_GEN_GO_VERSION=${PROTOC_GEN_GO_VERSION} \
+	--build-arg PROTOC_GEN_GO_GRPC_VERSION=${PROTOC_GEN_GO_GRPC_VERSION} \
 	--build-arg PROTOC_GEN_GRPC_GATEWAY_VERSION=${PROTOC_GEN_GRPC_GATEWAY_VERSION} \
 	--build-arg PROTOC_GEN_CPP_VERSION=${PROTOC_GEN_CPP_VERSION} \
 	-t ${IMAGENAME}:${DOCKER_TAG}-protoc \