diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile
index f29e6ba1a..e60a2e864 100644
--- a/hack/dockerfiles/generated-files.Dockerfile
+++ b/hack/dockerfiles/generated-files.Dockerfile
@@ -3,20 +3,19 @@
 # protoc is dynamically linked to glibc to can't use golang:1.10-alpine
 FROM golang:1.13-buster AS gobuild-base
 ARG PROTOC_VERSION=3.1.0
-ARG GOGO_VERSION=master
+ARG GOGO_VERSION=v1.3.2
 RUN apt-get update && apt-get --no-install-recommends install -y \
-	git \
 	unzip \
 	&& true
 RUN wget -q https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip && unzip protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /usr/local
 
-RUN go get -d github.com/gogo/protobuf/protoc-gen-gogofaster \
+RUN git clone https://github.com/gogo/protobuf.git /go/src/github.com/gogo/protobuf \
 	&& cd /go/src/github.com/gogo/protobuf \
 	&& git checkout -q $GOGO_VERSION \
 	&& go install ./protoc-gen-gogo ./protoc-gen-gogofaster ./protoc-gen-gogoslick
 
-ARG PROTOBUF_VERSION=v1.3.3
-RUN go get -d github.com/golang/protobuf/protoc-gen-go \
+ARG PROTOBUF_VERSION=v1.3.5
+RUN git clone https://github.com/golang/protobuf.git /go/src/github.com/golang/protobuf \
 	&& cd /go/src/github.com/golang/protobuf \
 	&& git checkout -q $PROTOBUF_VERSION \
 	&& go install ./protoc-gen-go
diff --git a/hack/update-generated-files b/hack/update-generated-files
index a58262028..1004a5e26 100755
--- a/hack/update-generated-files
+++ b/hack/update-generated-files
@@ -4,11 +4,13 @@
 set -eu
 
 gogo_version=$(awk '$1 == "github.com/gogo/protobuf" { print $2 }' go.mod)
+protobuf_version=$(awk '$3 == "github.com/golang/protobuf" { print $4 }' go.mod)
 output=$(mktemp -d -t buildctl-output.XXXXXXXXXX)
 
 buildxCmd build \
   --target "update" \
   --build-arg "GOGO_VERSION=$gogo_version" \
+  --build-arg "PROTOBUF_VERSION=$protobuf_version" \
   --output "type=local,dest=$output" \
   --file "./hack/dockerfiles/generated-files.Dockerfile" \
   .
diff --git a/util/stack/stack.pb.go b/util/stack/stack.pb.go
index cefb30a8f..df55582db 100644
--- a/util/stack/stack.pb.go
+++ b/util/stack/stack.pb.go
@@ -151,7 +151,9 @@ func init() {
 	proto.RegisterType((*Frame)(nil), "stack.Frame")
 }
 
-func init() { proto.RegisterFile("stack.proto", fileDescriptor_b44c07feb2ca0a5a) }
+func init() {
+	proto.RegisterFile("stack.proto", fileDescriptor_b44c07feb2ca0a5a)
+}
 
 var fileDescriptor_b44c07feb2ca0a5a = []byte{
 	// 185 bytes of a gzipped FileDescriptorProto