diff --git a/src/.golangci.yml b/src/.golangci.yml
index 01e3b8faf..3c3433cf4 100644
--- a/src/.golangci.yml
+++ b/src/.golangci.yml
@@ -5,3 +5,16 @@ linters:
   enable:
     - gofmt
     - misspell
+    - gci
+
+linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/alcionai/corso)
+    skip-generated: true
+
+issues:
+  # Limit on number of errors with identical text reported.
+  max-same-issues: 50
diff --git a/src/cli/config/account.go b/src/cli/config/account.go
index cb7f8418f..a86b5ad26 100644
--- a/src/cli/config/account.go
+++ b/src/cli/config/account.go
@@ -3,11 +3,12 @@ package config
 import (
 	"os"
 
+	"github.com/pkg/errors"
+	"github.com/spf13/viper"
+
 	"github.com/alcionai/corso/cli/utils"
 	"github.com/alcionai/corso/pkg/account"
 	"github.com/alcionai/corso/pkg/credentials"
-	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 )
 
 // prerequisite: readRepoConfig must have been run prior to this to populate the global viper values.
diff --git a/src/cli/config/storage.go b/src/cli/config/storage.go
index 068d7476d..a048bed5d 100644
--- a/src/cli/config/storage.go
+++ b/src/cli/config/storage.go
@@ -3,11 +3,12 @@ package config
 import (
 	"os"
 
+	"github.com/pkg/errors"
+	"github.com/spf13/viper"
+
 	"github.com/alcionai/corso/cli/utils"
 	"github.com/alcionai/corso/pkg/credentials"
 	"github.com/alcionai/corso/pkg/storage"
-	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 )
 
 // prerequisite: readRepoConfig must have been run prior to this to populate the global viper values.
diff --git a/src/cli/options/options.go b/src/cli/options/options.go
index 9eabef8e7..9277cb18b 100644
--- a/src/cli/options/options.go
+++ b/src/cli/options/options.go
@@ -1,8 +1,9 @@
 package options
 
 import (
-	"github.com/alcionai/corso/pkg/control"
 	"github.com/spf13/cobra"
+
+	"github.com/alcionai/corso/pkg/control"
 )
 
 var (
diff --git a/src/cli/print/print.go b/src/cli/print/print.go
index 3e76223bb..baf4659d0 100644
--- a/src/cli/print/print.go
+++ b/src/cli/print/print.go
@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/alcionai/corso/pkg/backup"
-	"github.com/alcionai/corso/pkg/backup/details"
 	"github.com/spf13/cobra"
 	"github.com/tidwall/pretty"
 	"github.com/tomlazar/table"
+
+	"github.com/alcionai/corso/pkg/backup"
+	"github.com/alcionai/corso/pkg/backup/details"
 )
 
 var (
diff --git a/src/internal/connector/exchange/message.go b/src/internal/connector/exchange/message.go
index 5805ef89d..950c443fc 100644
--- a/src/internal/connector/exchange/message.go
+++ b/src/internal/connector/exchange/message.go
@@ -3,8 +3,9 @@ package exchange
 import (
 	"time"
 
-	"github.com/alcionai/corso/pkg/backup/details"
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
+
+	"github.com/alcionai/corso/pkg/backup/details"
 )
 
 func MessageInfo(msg models.Messageable) *details.ExchangeInfo {
diff --git a/src/internal/connector/exchange/message_test.go b/src/internal/connector/exchange/message_test.go
index d4e9f1b95..a8fd05248 100644
--- a/src/internal/connector/exchange/message_test.go
+++ b/src/internal/connector/exchange/message_test.go
@@ -4,9 +4,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/alcionai/corso/pkg/backup/details"
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/alcionai/corso/pkg/backup/details"
 )
 
 type MessageSuite struct {
diff --git a/src/internal/connector/support/m365Transform.go b/src/internal/connector/support/m365Transform.go
index ee71bb9fb..d9bb624d4 100644
--- a/src/internal/connector/support/m365Transform.go
+++ b/src/internal/connector/support/m365Transform.go
@@ -5,9 +5,8 @@ import (
 	"strconv"
 
 	kw "github.com/microsoft/kiota-serialization-json-go"
-	"github.com/pkg/errors"
-
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
+	"github.com/pkg/errors"
 )
 
 var eventResponsableFields = []string{"responseType"}
diff --git a/src/internal/model/model_test.go b/src/internal/model/model_test.go
index 6d779b5ca..4cdca6726 100644
--- a/src/internal/model/model_test.go
+++ b/src/internal/model/model_test.go
@@ -3,9 +3,10 @@ package model_test
 import (
 	"testing"
 
-	"github.com/alcionai/corso/internal/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/alcionai/corso/internal/model"
 )
 
 type ModelUnitSuite struct {
diff --git a/src/internal/tester/account.go b/src/internal/tester/account.go
index 380876c86..c344e1d1f 100644
--- a/src/internal/tester/account.go
+++ b/src/internal/tester/account.go
@@ -1,9 +1,10 @@
 package tester
 
 import (
+	"github.com/pkg/errors"
+
 	"github.com/alcionai/corso/pkg/account"
 	"github.com/alcionai/corso/pkg/credentials"
-	"github.com/pkg/errors"
 )
 
 var M365AcctCredEnvs = []string{
diff --git a/src/internal/tester/config.go b/src/internal/tester/config.go
index f2104fd75..b29b0ff70 100644
--- a/src/internal/tester/config.go
+++ b/src/internal/tester/config.go
@@ -5,9 +5,10 @@ import (
 	"path"
 	"strings"
 
-	"github.com/alcionai/corso/pkg/account"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
+
+	"github.com/alcionai/corso/pkg/account"
 )
 
 const (
diff --git a/src/internal/tester/storage.go b/src/internal/tester/storage.go
index e1163ee9c..16c01ebbd 100644
--- a/src/internal/tester/storage.go
+++ b/src/internal/tester/storage.go
@@ -3,9 +3,10 @@ package tester
 import (
 	"testing"
 
+	"github.com/pkg/errors"
+
 	"github.com/alcionai/corso/pkg/credentials"
 	"github.com/alcionai/corso/pkg/storage"
-	"github.com/pkg/errors"
 )
 
 var AWSStorageCredEnvs = []string{
diff --git a/src/pkg/filters/filters_test.go b/src/pkg/filters/filters_test.go
index 7512a1f8d..0ebd87686 100644
--- a/src/pkg/filters/filters_test.go
+++ b/src/pkg/filters/filters_test.go
@@ -3,9 +3,10 @@ package filters_test
 import (
 	"testing"
 
-	"github.com/alcionai/corso/pkg/filters"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/alcionai/corso/pkg/filters"
 )
 
 type FiltersSuite struct {
diff --git a/src/pkg/selectors/exchange_test.go b/src/pkg/selectors/exchange_test.go
index 4d5a72112..a1f235b4a 100644
--- a/src/pkg/selectors/exchange_test.go
+++ b/src/pkg/selectors/exchange_test.go
@@ -4,11 +4,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/alcionai/corso/internal/common"
-	"github.com/alcionai/corso/pkg/backup/details"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+
+	"github.com/alcionai/corso/internal/common"
+	"github.com/alcionai/corso/pkg/backup/details"
 )
 
 type ExchangeSourceSuite struct {