diff --git a/internal/pkg/agent/application/upgrade/watcher_test.go b/internal/pkg/agent/application/upgrade/watcher_test.go
index 68ea6524433..42894c63d32 100644
--- a/internal/pkg/agent/application/upgrade/watcher_test.go
+++ b/internal/pkg/agent/application/upgrade/watcher_test.go
@@ -7,15 +7,17 @@ package upgrade
 import (
 	"context"
 	"fmt"
-	"github.com/elastic/elastic-agent/pkg/control/v2/client"
-	"github.com/elastic/elastic-agent/pkg/control/v2/cproto"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
 	"net"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc"
+
+	"github.com/elastic/elastic-agent/pkg/control/v2/client"
+	"github.com/elastic/elastic-agent/pkg/control/v2/cproto"
+
 	"github.com/elastic/elastic-agent/pkg/core/logger"
 )
 
diff --git a/pkg/control/v1/proto/control_v1.pb.go b/pkg/control/v1/proto/control_v1.pb.go
index 65b95921808..59b8b4fb9f0 100644
--- a/pkg/control/v1/proto/control_v1.pb.go
+++ b/pkg/control/v1/proto/control_v1.pb.go
@@ -16,10 +16,11 @@
 package proto
 
 import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
 const (
diff --git a/pkg/control/v1/proto/control_v1_grpc.pb.go b/pkg/control/v1/proto/control_v1_grpc.pb.go
index 1df65b339fe..bd4536b5578 100644
--- a/pkg/control/v1/proto/control_v1_grpc.pb.go
+++ b/pkg/control/v1/proto/control_v1_grpc.pb.go
@@ -17,6 +17,7 @@ package proto
 
 import (
 	context "context"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
diff --git a/pkg/control/v2/cproto/control_v2.pb.go b/pkg/control/v2/cproto/control_v2.pb.go
index 59cbb5f7940..688b7a27f38 100644
--- a/pkg/control/v2/cproto/control_v2.pb.go
+++ b/pkg/control/v2/cproto/control_v2.pb.go
@@ -11,11 +11,12 @@
 package cproto
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
diff --git a/pkg/control/v2/cproto/control_v2_grpc.pb.go b/pkg/control/v2/cproto/control_v2_grpc.pb.go
index 305021747b2..286fc0bb749 100644
--- a/pkg/control/v2/cproto/control_v2_grpc.pb.go
+++ b/pkg/control/v2/cproto/control_v2_grpc.pb.go
@@ -12,6 +12,7 @@ package cproto
 
 import (
 	context "context"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"