diff --git a/Makefile b/Makefile
index d8a5e7b38..c6d3d8e38 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ all: cli
 
 protos: ## Generate go code from .proto files
 	@docker build . \
+	--output type=local,dest=. \
 	--target protos
 
 cli: ## Compile the cli
diff --git a/azure/convert/convert.go b/azure/convert/convert.go
index 490599e69..1f4523acf 100644
--- a/azure/convert/convert.go
+++ b/azure/convert/convert.go
@@ -10,6 +10,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/profiles/latest/containerinstance/mgmt/containerinstance"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/compose-spec/compose-go/types"
+
 	"github.com/docker/api/compose"
 	"github.com/docker/api/context/store"
 )
diff --git a/backend/v1/backend.pb.go b/backend/v1/backend.pb.go
index 013dd4947..b93e99e7c 100644
--- a/backend/v1/backend.pb.go
+++ b/backend/v1/backend.pb.go
@@ -26,7 +26,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.21.0-devel
+// 	protoc-gen-go v1.22.0
 // 	protoc        v3.6.1
 // source: backend/v1/backend.proto
 
diff --git a/cli/v1/cli.pb.go b/cli/v1/cli.pb.go
index a0faba286..8a8be6910 100644
--- a/cli/v1/cli.pb.go
+++ b/cli/v1/cli.pb.go
@@ -26,7 +26,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.21.0-devel
+// 	protoc-gen-go v1.22.0
 // 	protoc        v3.6.1
 // source: cli/v1/cli.proto
 
diff --git a/compose/v1/compose.pb.go b/compose/v1/compose.pb.go
index fe2917e72..f0dda24cc 100644
--- a/compose/v1/compose.pb.go
+++ b/compose/v1/compose.pb.go
@@ -26,7 +26,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.21.0-devel
+// 	protoc-gen-go v1.22.0
 // 	protoc        v3.6.1
 // source: compose/v1/compose.proto
 
diff --git a/containers/v1/containers.pb.go b/containers/v1/containers.pb.go
index 632e7b6b9..b204eddfe 100644
--- a/containers/v1/containers.pb.go
+++ b/containers/v1/containers.pb.go
@@ -26,7 +26,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.21.0-devel
+// 	protoc-gen-go v1.22.0
 // 	protoc        v3.6.1
 // source: containers/v1/containers.proto
 
diff --git a/tests/aci-e2e/e2e-aci.go b/tests/aci-e2e/e2e-aci.go
index 0f45688e8..95790cc20 100644
--- a/tests/aci-e2e/e2e-aci.go
+++ b/tests/aci-e2e/e2e-aci.go
@@ -5,9 +5,10 @@ import (
 	"log"
 
 	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/resources/mgmt/resources"
+	. "github.com/onsi/gomega"
+
 	"github.com/docker/api/azure"
 	. "github.com/docker/api/tests/framework"
-	. "github.com/onsi/gomega"
 )
 
 const resourceGroupName = "resourceGroupTest"
diff --git a/tests/e2e/e2e.go b/tests/e2e/e2e.go
index 3b7064876..d20173ed3 100644
--- a/tests/e2e/e2e.go
+++ b/tests/e2e/e2e.go
@@ -3,8 +3,9 @@ package main
 import (
 	"time"
 
-	. "github.com/docker/api/tests/framework"
 	. "github.com/onsi/gomega"
+
+	. "github.com/docker/api/tests/framework"
 )
 
 func main() {