diff --git a/x-pack/osquerybeat/beater/config_plugin_test.go b/x-pack/osquerybeat/beater/config_plugin_test.go
index 456836a0a59..c8c52371a38 100644
--- a/x-pack/osquerybeat/beater/config_plugin_test.go
+++ b/x-pack/osquerybeat/beater/config_plugin_test.go
@@ -11,9 +11,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/google/go-cmp/cmp"
 
+	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/elastic/beats/v7/x-pack/osquerybeat/internal/testutil"
 )
 
diff --git a/x-pack/osquerybeat/beater/logger_plugin.go b/x-pack/osquerybeat/beater/logger_plugin.go
index 83c510207f5..3160c4d64f3 100644
--- a/x-pack/osquerybeat/beater/logger_plugin.go
+++ b/x-pack/osquerybeat/beater/logger_plugin.go
@@ -8,8 +8,9 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/kolide/osquery-go/plugin/logger"
+
+	"github.com/elastic/beats/v7/libbeat/logp"
 )
 
 type SnapshotResult struct {
diff --git a/x-pack/osquerybeat/beater/logger_plugin_test.go b/x-pack/osquerybeat/beater/logger_plugin_test.go
index a501d8aebab..d5dd625df67 100644
--- a/x-pack/osquerybeat/beater/logger_plugin_test.go
+++ b/x-pack/osquerybeat/beater/logger_plugin_test.go
@@ -9,10 +9,10 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/google/go-cmp/cmp"
 	"github.com/kolide/osquery-go/plugin/logger"
 
+	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/elastic/beats/v7/x-pack/osquerybeat/internal/testutil"
 )
 
diff --git a/x-pack/osquerybeat/internal/osqd/osqueryd.go b/x-pack/osquerybeat/internal/osqd/osqueryd.go
index e3de3e00913..f2e5f184bda 100644
--- a/x-pack/osquerybeat/internal/osqd/osqueryd.go
+++ b/x-pack/osquerybeat/internal/osqd/osqueryd.go
@@ -18,8 +18,9 @@ import (
 	"time"
 
 	"github.com/dolmen-go/contextio"
-	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/pkg/errors"
+
+	"github.com/elastic/beats/v7/libbeat/logp"
 )
 
 const (
diff --git a/x-pack/osquerybeat/internal/osqd/osqueryd_windows.go b/x-pack/osquerybeat/internal/osqd/osqueryd_windows.go
index 22b4f2e820f..758dce74500 100644
--- a/x-pack/osquerybeat/internal/osqd/osqueryd_windows.go
+++ b/x-pack/osquerybeat/internal/osqd/osqueryd_windows.go
@@ -13,8 +13,9 @@ import (
 
 	"github.com/gofrs/uuid"
 )
+
 const (
-	extensionName   = "osquery-extension.exe"
+	extensionName = "osquery-extension.exe"
 )
 
 func CreateSocketPath() (string, func(), error) {
diff --git a/x-pack/osquerybeat/internal/osqdcli/client.go b/x-pack/osquerybeat/internal/osqdcli/client.go
index ae582226573..ceb0fee340f 100644
--- a/x-pack/osquerybeat/internal/osqdcli/client.go
+++ b/x-pack/osquerybeat/internal/osqdcli/client.go
@@ -14,8 +14,9 @@ import (
 
 	"golang.org/x/sync/semaphore"
 
-	"github.com/elastic/beats/v7/libbeat/logp"
 	"github.com/kolide/osquery-go"
+
+	"github.com/elastic/beats/v7/libbeat/logp"
 )
 
 const (