diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go
index c77051617..9dbc54cac 100644
--- a/caddy/caddymain/run.go
+++ b/caddy/caddymain/run.go
@@ -29,12 +29,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/uuid"
-	"github.com/klauspost/cpuid"
 	"github.com/caddyserver/caddy"
 	"github.com/caddyserver/caddy/caddyfile"
 	"github.com/caddyserver/caddy/caddytls"
 	"github.com/caddyserver/caddy/telemetry"
+	"github.com/google/uuid"
+	"github.com/klauspost/cpuid"
 	"github.com/mholt/certmagic"
 	lumberjack "gopkg.in/natefinch/lumberjack.v2"
 
diff --git a/caddyhttp/basicauth/basicauth.go b/caddyhttp/basicauth/basicauth.go
index 81cd47f71..36fc2a136 100644
--- a/caddyhttp/basicauth/basicauth.go
+++ b/caddyhttp/basicauth/basicauth.go
@@ -33,8 +33,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/jimstudt/http-authentication/basic"
 	"github.com/caddyserver/caddy/caddyhttp/httpserver"
+	"github.com/jimstudt/http-authentication/basic"
 )
 
 // BasicAuth is middleware to protect resources with a username and password.
diff --git a/caddyhttp/browse/browse.go b/caddyhttp/browse/browse.go
index eab7c5e12..8cd533281 100644
--- a/caddyhttp/browse/browse.go
+++ b/caddyhttp/browse/browse.go
@@ -29,9 +29,9 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/dustin/go-humanize"
 	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 	"github.com/caddyserver/caddy/caddyhttp/staticfiles"
+	"github.com/dustin/go-humanize"
 )
 
 const (
diff --git a/caddyhttp/httpserver/logger.go b/caddyhttp/httpserver/logger.go
index 8db33107b..e5c9ac027 100644
--- a/caddyhttp/httpserver/logger.go
+++ b/caddyhttp/httpserver/logger.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"sync"
 
-	gsyslog "github.com/hashicorp/go-syslog"
 	"github.com/caddyserver/caddy"
+	gsyslog "github.com/hashicorp/go-syslog"
 )
 
 var remoteSyslogPrefixes = map[string]string{
diff --git a/caddyhttp/httpserver/server.go b/caddyhttp/httpserver/server.go
index 5368407b4..3bd434c2f 100644
--- a/caddyhttp/httpserver/server.go
+++ b/caddyhttp/httpserver/server.go
@@ -31,11 +31,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/lucas-clemente/quic-go/h2quic"
 	"github.com/caddyserver/caddy"
 	"github.com/caddyserver/caddy/caddyhttp/staticfiles"
 	"github.com/caddyserver/caddy/caddytls"
 	"github.com/caddyserver/caddy/telemetry"
+	"github.com/lucas-clemente/quic-go/h2quic"
 )
 
 // Server is the HTTP server implementation.
diff --git a/caddyhttp/proxy/reverseproxy.go b/caddyhttp/proxy/reverseproxy.go
index a223d3532..ac126ad30 100644
--- a/caddyhttp/proxy/reverseproxy.go
+++ b/caddyhttp/proxy/reverseproxy.go
@@ -41,9 +41,9 @@ import (
 
 	"golang.org/x/net/http2"
 
+	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 	"github.com/lucas-clemente/quic-go"
 	"github.com/lucas-clemente/quic-go/h2quic"
-	"github.com/caddyserver/caddy/caddyhttp/httpserver"
 )
 
 var (
diff --git a/caddyhttp/requestid/requestid.go b/caddyhttp/requestid/requestid.go
index 83d76d7ad..fb9b7d0a1 100644
--- a/caddyhttp/requestid/requestid.go
+++ b/caddyhttp/requestid/requestid.go
@@ -19,8 +19,8 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/google/uuid"
 	"github.com/caddyserver/caddy/caddyhttp/httpserver"
+	"github.com/google/uuid"
 )
 
 // Handler is a middleware handler
diff --git a/caddyhttp/websocket/websocket.go b/caddyhttp/websocket/websocket.go
index 69b10ca72..0b8021492 100644
--- a/caddyhttp/websocket/websocket.go
+++ b/caddyhttp/websocket/websocket.go
@@ -29,8 +29,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gorilla/websocket"
 	"github.com/caddyserver/caddy/caddyhttp/httpserver"
+	"github.com/gorilla/websocket"
 )
 
 const (
diff --git a/caddytls/config.go b/caddytls/config.go
index 817fb0da8..365b54600 100644
--- a/caddytls/config.go
+++ b/caddytls/config.go
@@ -23,9 +23,9 @@ import (
 
 	"github.com/go-acme/lego/challenge/tlsalpn01"
 
+	"github.com/caddyserver/caddy"
 	"github.com/go-acme/lego/certcrypto"
 	"github.com/klauspost/cpuid"
-	"github.com/caddyserver/caddy"
 	"github.com/mholt/certmagic"
 )
 
diff --git a/caddytls/setup_test.go b/caddytls/setup_test.go
index c7256b232..0502062c8 100644
--- a/caddytls/setup_test.go
+++ b/caddytls/setup_test.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/go-acme/lego/certcrypto"
 	"github.com/caddyserver/caddy"
+	"github.com/go-acme/lego/certcrypto"
 	"github.com/mholt/certmagic"
 )
 
diff --git a/caddytls/tls.go b/caddytls/tls.go
index 6af874592..9e15713aa 100644
--- a/caddytls/tls.go
+++ b/caddytls/tls.go
@@ -29,8 +29,8 @@
 package caddytls
 
 import (
-	"github.com/go-acme/lego/challenge"
 	"github.com/caddyserver/caddy"
+	"github.com/go-acme/lego/challenge"
 	"github.com/mholt/certmagic"
 )
 
diff --git a/onevent/hook/hook_test.go b/onevent/hook/hook_test.go
index f3b3d67e8..15a47fa14 100644
--- a/onevent/hook/hook_test.go
+++ b/onevent/hook/hook_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/caddyserver/caddy"
+	"github.com/google/uuid"
 )
 
 func TestHook(t *testing.T) {
diff --git a/onevent/on.go b/onevent/on.go
index 2ba99e8b7..1124d67bd 100644
--- a/onevent/on.go
+++ b/onevent/on.go
@@ -3,9 +3,9 @@ package onevent
 import (
 	"strings"
 
-	"github.com/google/uuid"
 	"github.com/caddyserver/caddy"
 	"github.com/caddyserver/caddy/onevent/hook"
+	"github.com/google/uuid"
 )
 
 func init() {