diff --git a/api/types/plugins/logdriver/gen.go b/api/types/plugins/logdriver/gen.go
index e5f10b5e0d..04d39c2f95 100644
--- a/api/types/plugins/logdriver/gen.go
+++ b/api/types/plugins/logdriver/gen.go
@@ -1,3 +1,3 @@
-//go:generate protoc --gogofast_out=import_path=github.com/docker/docker/api/types/plugins/logdriver:. entry.proto
+//go:generate protoc --gogofaster_out=import_path=github.com/docker/docker/api/types/plugins/logdriver:. entry.proto
 
 package logdriver // import "github.com/docker/docker/api/types/plugins/logdriver"
diff --git a/api/types/swarm/runtime/gen.go b/api/types/swarm/runtime/gen.go
index 44c680835e..292bd7afc8 100644
--- a/api/types/swarm/runtime/gen.go
+++ b/api/types/swarm/runtime/gen.go
@@ -1,3 +1,3 @@
-//go:generate protoc --gogofast_out=import_path=github.com/docker/docker/api/types/swarm/runtime:. plugin.proto
+//go:generate protoc --gogofaster_out=import_path=github.com/docker/docker/api/types/swarm/runtime:. plugin.proto
 
 package runtime // import "github.com/docker/docker/api/types/swarm/runtime"
diff --git a/hack/dockerfiles/generate-files.Dockerfile b/hack/dockerfiles/generate-files.Dockerfile
index 40d52f5918..6d3b76dc06 100644
--- a/hack/dockerfiles/generate-files.Dockerfile
+++ b/hack/dockerfiles/generate-files.Dockerfile
@@ -36,7 +36,7 @@ RUN --mount=from=src,source=/out,target=.,rw \
   set -ex
   ./hack/with-go-mod.sh go install -v -mod=vendor -modfile=vendor.mod \
     github.com/gogo/protobuf/protoc-gen-gogo \
-    github.com/gogo/protobuf/protoc-gen-gogofast \
+    github.com/gogo/protobuf/protoc-gen-gogofaster \
     github.com/gogo/protobuf/protoc-gen-gogoslick \
     github.com/golang/protobuf/protoc-gen-go
   ./hack/with-go-mod.sh go build -v -mod=vendor -modfile=vendor.mod \
diff --git a/internal/tools/tools.go b/internal/tools/tools.go
index beb8873868..042824dfb6 100644
--- a/internal/tools/tools.go
+++ b/internal/tools/tools.go
@@ -9,7 +9,7 @@ package tools
 
 import (
 	_ "github.com/gogo/protobuf/protoc-gen-gogo"
-	_ "github.com/gogo/protobuf/protoc-gen-gogofast"
+	_ "github.com/gogo/protobuf/protoc-gen-gogofaster"
 	_ "github.com/gogo/protobuf/protoc-gen-gogoslick"
 	_ "github.com/golang/protobuf/protoc-gen-go"
 )
diff --git a/libnetwork/agent.go b/libnetwork/agent.go
index 0f78c54a8f..e655297339 100644
--- a/libnetwork/agent.go
+++ b/libnetwork/agent.go
@@ -1,6 +1,6 @@
 package libnetwork
 
-//go:generate protoc -I=. -I=../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork:. agent.proto
+//go:generate protoc -I=. -I=../vendor/ --gogofaster_out=import_path=github.com/docker/docker/libnetwork:. agent.proto
 
 import (
 	"encoding/json"
diff --git a/libnetwork/drivers/overlay/overlay.go b/libnetwork/drivers/overlay/overlay.go
index dc1e63ae1d..4422cef8c7 100644
--- a/libnetwork/drivers/overlay/overlay.go
+++ b/libnetwork/drivers/overlay/overlay.go
@@ -2,7 +2,7 @@
 
 package overlay
 
-//go:generate protoc -I=. -I=../../../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork/drivers/overlay:. overlay.proto
+//go:generate protoc -I=. -I=../../../vendor/ --gogofaster_out=import_path=github.com/docker/docker/libnetwork/drivers/overlay:. overlay.proto
 
 import (
 	"fmt"
diff --git a/libnetwork/networkdb/networkdb.go b/libnetwork/networkdb/networkdb.go
index 5e99c40536..9813c9f547 100644
--- a/libnetwork/networkdb/networkdb.go
+++ b/libnetwork/networkdb/networkdb.go
@@ -1,6 +1,6 @@
 package networkdb
 
-//go:generate protoc -I=. -I=../../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork/networkdb:. networkdb.proto
+//go:generate protoc -I=. -I=../../vendor/ --gogofaster_out=import_path=github.com/docker/docker/libnetwork/networkdb:. networkdb.proto
 
 import (
 	"context"
diff --git a/vendor/github.com/gogo/protobuf/protoc-gen-gogofast/main.go b/vendor/github.com/gogo/protobuf/protoc-gen-gogofaster/main.go
similarity index 86%
rename from vendor/github.com/gogo/protobuf/protoc-gen-gogofast/main.go
rename to vendor/github.com/gogo/protobuf/protoc-gen-gogofaster/main.go
index 96c18d9fc7..356fcfa0ac 100644
--- a/vendor/github.com/gogo/protobuf/protoc-gen-gogofast/main.go
+++ b/vendor/github.com/gogo/protobuf/protoc-gen-gogofaster/main.go
@@ -42,6 +42,11 @@ func main() {
 	vanity.ForEachFile(files, vanity.TurnOnSizerAll)
 	vanity.ForEachFile(files, vanity.TurnOnUnmarshalerAll)
 
+	vanity.ForEachFieldInFilesExcludingExtensions(vanity.OnlyProto2(files), vanity.TurnOffNullableForNativeTypesWithoutDefaultsOnly)
+	vanity.ForEachFile(files, vanity.TurnOffGoUnrecognizedAll)
+	vanity.ForEachFile(files, vanity.TurnOffGoUnkeyedAll)
+	vanity.ForEachFile(files, vanity.TurnOffGoSizecacheAll)
+
 	resp := command.Generate(req)
 	command.Write(resp)
 }
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 3f43fd905a..3f0cc48806 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -469,7 +469,7 @@ github.com/gogo/protobuf/protoc-gen-gogo/generator
 github.com/gogo/protobuf/protoc-gen-gogo/generator/internal/remap
 github.com/gogo/protobuf/protoc-gen-gogo/grpc
 github.com/gogo/protobuf/protoc-gen-gogo/plugin
-github.com/gogo/protobuf/protoc-gen-gogofast
+github.com/gogo/protobuf/protoc-gen-gogofaster
 github.com/gogo/protobuf/protoc-gen-gogoslick
 github.com/gogo/protobuf/sortkeys
 github.com/gogo/protobuf/types