diff --git a/datacatalog/.golangci.yml b/datacatalog/.golangci.yml
index 7f4dbc80e8..6d13f4a3b6 100644
--- a/datacatalog/.golangci.yml
+++ b/datacatalog/.golangci.yml
@@ -38,3 +38,6 @@ linters-settings:
       - default
       - prefix(github.com/flyteorg)
     skip-generated: true
+issues:
+  exclude:
+    - copylocks
diff --git a/datacatalog/pkg/manager/impl/artifact_manager_test.go b/datacatalog/pkg/manager/impl/artifact_manager_test.go
index 420c9bd4fd..7d8cda2bf6 100644
--- a/datacatalog/pkg/manager/impl/artifact_manager_test.go
+++ b/datacatalog/pkg/manager/impl/artifact_manager_test.go
@@ -5,9 +5,9 @@ import (
 	stdErrors "errors"
 	"fmt"
 	"os"
+	"reflect"
 	"testing"
 	"time"
-	"reflect"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
@@ -15,12 +15,13 @@ import (
 	"github.com/stretchr/testify/mock"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/transformers"
+
 	"github.com/flyteorg/flyte/datacatalog/pkg/common"
 	"github.com/flyteorg/flyte/datacatalog/pkg/errors"
 	repoErrors "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors"
 	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/mocks"
 	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/models"
+	"github.com/flyteorg/flyte/datacatalog/pkg/repositories/transformers"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/core"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/datacatalog"
 	"github.com/flyteorg/flyte/flytestdlib/contextutils"
@@ -657,7 +658,6 @@ func TestUpdateArtifact(t *testing.T) {
 					reflect.DeepEqual(artifact.SerializedMetadata, serializedMetadata)
 			})).Return(nil)
 
-
 		request := &datacatalog.UpdateArtifactRequest{
 			Dataset: expectedDataset.Id,
 			QueryHandle: &datacatalog.UpdateArtifactRequest_ArtifactId{
diff --git a/datacatalog/pkg/repositories/errors/postgres.go b/datacatalog/pkg/repositories/errors/postgres.go
index 2d018d56a6..2ab8a2895c 100644
--- a/datacatalog/pkg/repositories/errors/postgres.go
+++ b/datacatalog/pkg/repositories/errors/postgres.go
@@ -3,7 +3,6 @@ package errors
 import (
 	"errors"
 	"fmt"
-	"github.com/flyteorg/flyte/flytestdlib/database"
 	"reflect"
 
 	"github.com/jackc/pgconn"
@@ -11,6 +10,7 @@ import (
 	"gorm.io/gorm"
 
 	catalogErrors "github.com/flyteorg/flyte/datacatalog/pkg/errors"
+	"github.com/flyteorg/flyte/flytestdlib/database"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
diff --git a/datacatalog/pkg/repositories/initialize.go b/datacatalog/pkg/repositories/initialize.go
index 150801345f..44451121bc 100644
--- a/datacatalog/pkg/repositories/initialize.go
+++ b/datacatalog/pkg/repositories/initialize.go
@@ -2,11 +2,11 @@ package repositories
 
 import (
 	"context"
-	"github.com/flyteorg/flyte/flytestdlib/database"
 	"reflect"
 
 	errors2 "github.com/flyteorg/flyte/datacatalog/pkg/repositories/errors"
 	"github.com/flyteorg/flyte/datacatalog/pkg/runtime"
+	"github.com/flyteorg/flyte/flytestdlib/database"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
 )