diff --git a/builtin/credential/okta/path_config.go b/builtin/credential/okta/path_config.go
index db3e9c54ad48..b74fdbb9b801 100644
--- a/builtin/credential/okta/path_config.go
+++ b/builtin/credential/okta/path_config.go
@@ -14,14 +14,13 @@ import (
 	"strings"
 	"time"
 
-	gocache "github.com/patrickmn/go-cache"
-
 	oktaold "github.com/chrismalek/oktasdk-go/okta"
 	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/helper/tokenutil"
 	"github.com/hashicorp/vault/sdk/logical"
 	oktanew "github.com/okta/okta-sdk-golang/v5/okta"
+	gocache "github.com/patrickmn/go-cache"
 )
 
 const (
diff --git a/builtin/logical/pki/issuing/cert_verify.go b/builtin/logical/pki/issuing/cert_verify.go
index a04b1c83b744..f17cd7de087d 100644
--- a/builtin/logical/pki/issuing/cert_verify.go
+++ b/builtin/logical/pki/issuing/cert_verify.go
@@ -6,13 +6,13 @@ package issuing
 import (
 	"context"
 	"fmt"
-	"github.com/hashicorp/vault/sdk/logical"
 	"os"
 	"strconv"
 	"time"
 
 	ctx509 "github.com/google/certificate-transparency-go/x509"
 	"github.com/hashicorp/vault/sdk/helper/certutil"
+	"github.com/hashicorp/vault/sdk/logical"
 )
 
 // disableVerifyCertificateEnvVar is an environment variable that can be used to disable the
diff --git a/tools/pipeline/internal/cmd/generate_enos_dynamic_config.go b/tools/pipeline/internal/cmd/generate_enos_dynamic_config.go
index 955b71ae3780..e2e3c63f4d97 100644
--- a/tools/pipeline/internal/cmd/generate_enos_dynamic_config.go
+++ b/tools/pipeline/internal/cmd/generate_enos_dynamic_config.go
@@ -6,10 +6,9 @@ package cmd
 import (
 	"context"
 
-	"github.com/spf13/cobra"
-
 	"github.com/hashicorp/vault/tools/pipeline/internal/pkg/generate"
 	"github.com/hashicorp/vault/tools/pipeline/internal/pkg/releases"
+	"github.com/spf13/cobra"
 )
 
 // skipVersionsDefault are versions that we skip by default. This list can grow as necessary.
diff --git a/tools/pipeline/internal/cmd/releases_list_versions.go b/tools/pipeline/internal/cmd/releases_list_versions.go
index 693d01453897..0fa7fbca8155 100644
--- a/tools/pipeline/internal/cmd/releases_list_versions.go
+++ b/tools/pipeline/internal/cmd/releases_list_versions.go
@@ -8,9 +8,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/spf13/cobra"
-
 	"github.com/hashicorp/vault/tools/pipeline/internal/pkg/releases"
+	"github.com/spf13/cobra"
 )
 
 var listReleaseVersionsReq = &releases.ListVersionsReq{
diff --git a/tools/pipeline/internal/pkg/generate/enos_dynamic_config.go b/tools/pipeline/internal/pkg/generate/enos_dynamic_config.go
index e0d71ed9a2dc..ccbc1b02c186 100644
--- a/tools/pipeline/internal/pkg/generate/enos_dynamic_config.go
+++ b/tools/pipeline/internal/pkg/generate/enos_dynamic_config.go
@@ -13,12 +13,11 @@ import (
 	"slices"
 
 	"github.com/Masterminds/semver"
-	slogctx "github.com/veqryn/slog-context"
-
 	"github.com/hashicorp/hcl/v2/gohcl"
 	"github.com/hashicorp/hcl/v2/hclwrite"
 	"github.com/hashicorp/vault/tools/pipeline/internal/pkg/metadata"
 	"github.com/hashicorp/vault/tools/pipeline/internal/pkg/releases"
+	slogctx "github.com/veqryn/slog-context"
 )
 
 // EnosDynamicConfigReq is a request to generate dynamic enos configuration
diff --git a/tools/pipeline/internal/pkg/generate/enos_dynamic_config_test.go b/tools/pipeline/internal/pkg/generate/enos_dynamic_config_test.go
index bb395a90a4eb..03f3ee0d6a3a 100644
--- a/tools/pipeline/internal/pkg/generate/enos_dynamic_config_test.go
+++ b/tools/pipeline/internal/pkg/generate/enos_dynamic_config_test.go
@@ -10,9 +10,8 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/vault/tools/pipeline/internal/pkg/releases"
+	"github.com/stretchr/testify/require"
 )
 
 var testAPIVersions = []string{
diff --git a/tools/pipeline/internal/pkg/releases/client.go b/tools/pipeline/internal/pkg/releases/client.go
index 86b0474093f2..0190c633e2c8 100644
--- a/tools/pipeline/internal/pkg/releases/client.go
+++ b/tools/pipeline/internal/pkg/releases/client.go
@@ -11,11 +11,10 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver"
-	slogctx "github.com/veqryn/slog-context"
-
 	"github.com/hashicorp/releases-api/pkg/api"
 	"github.com/hashicorp/releases-api/pkg/client"
 	"github.com/hashicorp/releases-api/pkg/models"
+	slogctx "github.com/veqryn/slog-context"
 )
 
 // Client is an api.releases.hashicorp.com API client.
diff --git a/tools/pipeline/internal/pkg/releases/client_mock.go b/tools/pipeline/internal/pkg/releases/client_mock.go
index 07537332326a..cd6c6b466721 100644
--- a/tools/pipeline/internal/pkg/releases/client_mock.go
+++ b/tools/pipeline/internal/pkg/releases/client_mock.go
@@ -7,7 +7,6 @@ import (
 	"context"
 
 	"github.com/Masterminds/semver"
-
 	"github.com/hashicorp/releases-api/pkg/models"
 )
 
diff --git a/tools/pipeline/internal/pkg/releases/list_versions.go b/tools/pipeline/internal/pkg/releases/list_versions.go
index bd2e9e1f0069..490e530945ac 100644
--- a/tools/pipeline/internal/pkg/releases/list_versions.go
+++ b/tools/pipeline/internal/pkg/releases/list_versions.go
@@ -11,9 +11,8 @@ import (
 	"slices"
 
 	"github.com/Masterminds/semver"
-	slogctx "github.com/veqryn/slog-context"
-
 	"github.com/hashicorp/vault/tools/pipeline/internal/pkg/metadata"
+	slogctx "github.com/veqryn/slog-context"
 )
 
 // ListVersionsReq is a request to list versions from the releases API.