diff --git a/CODEOWNERS b/CODEOWNERS
index 8b13789..7f8df27 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1,2 @@
-
+# Repository Maintainers
+* @launchdarkly/team-sdk-go
diff --git a/Makefile b/Makefile
index 0916d88..3bcd821 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-GOLANGCI_LINT_VERSION=v1.60.1
+GOLANGCI_LINT_VERSION=v2.11.1
 
 LINTER=./bin/golangci-lint
 LINTER_VERSION_FILE=./bin/.golangci-lint-version-$(GOLANGCI_LINT_VERSION)
diff --git a/dynamodb_builder_test.go b/dynamodb_builder_test.go
index 9614a27..eb80a1d 100644
--- a/dynamodb_builder_test.go
+++ b/dynamodb_builder_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestDataSourceBuilder(t *testing.T) {
@@ -74,8 +75,8 @@ func TestDataSourceBuilder(t *testing.T) {
 	})
 
 	t.Run("error for invalid configuration", func(t *testing.T) {
-		os.Setenv("AWS_CA_BUNDLE", "not a real CA file")
-		defer os.Setenv("AWS_CA_BUNDLE", "")
+		require.NoError(t, os.Setenv("AWS_CA_BUNDLE", "not a real CA file"))
+		t.Cleanup(func() { _ = os.Setenv("AWS_CA_BUNDLE", "") })
 
 		ds, err := DataStore("t").Build(subsystems.BasicClientContext{})
 		assert.Error(t, err)
diff --git a/dynamodb_test.go b/dynamodb_test.go
index 37ad0c3..151c636 100644
--- a/dynamodb_test.go
+++ b/dynamodb_test.go
@@ -133,7 +133,7 @@ func TestDataStoreSkipsAndLogsTooLargeItem(t *testing.T) {
 				ctx.Logging.Loggers = mockLog.Loggers
 				store, err := makeTestStore("").Build(ctx)
 				require.NoError(t, err)
-				defer store.Close()
+				defer store.Close() //nolint:errcheck // test cleanup
 
 				dataPlusBadItem := makeGoodData()
 				collection := dataPlusBadItem[params.collIndex]
@@ -163,7 +163,7 @@ func TestDataStoreSkipsAndLogsTooLargeItem(t *testing.T) {
 				ctx.Logging.Loggers = mockLog.Loggers
 				store, err := makeTestStore("").Build(ctx)
 				require.NoError(t, err)
-				defer store.Close()
+				defer store.Close() //nolint:errcheck // test cleanup
 
 				goodData := makeGoodData()
 				require.NoError(t, store.Init(goodData))