diff --git a/.golangci.yaml b/.golangci.yaml
index a7c481d2d..0390a562b 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -11,7 +11,7 @@ linters:
 #    - errorlint
     - gocritic
     - gofumpt
-#    - goimports
+    - goimports
     - gomodguard
     - gosimple
     - govet
@@ -43,6 +43,8 @@ linters-settings:
       - typeSwitchVar
       - unlambda #FIXME
       - wrapperFunc #FIXME
+  goimports:
+    local-prefixes: github.com/argoproj/gitops-engine
   revive:
     # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
     rules:
diff --git a/pkg/cache/references_test.go b/pkg/cache/references_test.go
index afa71de3d..cfec04c7f 100644
--- a/pkg/cache/references_test.go
+++ b/pkg/cache/references_test.go
@@ -3,12 +3,13 @@ package cache
 import (
 	"testing"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func Test_isStatefulSetChild(t *testing.T) {
diff --git a/pkg/diff/diff_test.go b/pkg/diff/diff_test.go
index 13f6c8b10..ed096813d 100644
--- a/pkg/diff/diff_test.go
+++ b/pkg/diff/diff_test.go
@@ -10,8 +10,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/argoproj/gitops-engine/pkg/diff/mocks"
-	"github.com/argoproj/gitops-engine/pkg/diff/testdata"
 	openapi_v2 "github.com/google/gnostic-models/openapiv2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -29,6 +27,9 @@ import (
 	"k8s.io/klog/v2/textlogger"
 	openapiproto "k8s.io/kube-openapi/pkg/util/proto"
 	"sigs.k8s.io/yaml"
+
+	"github.com/argoproj/gitops-engine/pkg/diff/mocks"
+	"github.com/argoproj/gitops-engine/pkg/diff/testdata"
 )
 
 func printDiff(result *DiffResult) (string, error) {
diff --git a/pkg/health/health.go b/pkg/health/health.go
index cb2d1b666..87dcc64c7 100644
--- a/pkg/health/health.go
+++ b/pkg/health/health.go
@@ -1,9 +1,10 @@
 package health
 
 import (
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 // Represents resource health status
diff --git a/pkg/health/health_apiservice.go b/pkg/health/health_apiservice.go
index 6b9fb44a5..c8d456af5 100644
--- a/pkg/health/health_apiservice.go
+++ b/pkg/health/health_apiservice.go
@@ -3,11 +3,12 @@ package health
 import (
 	"fmt"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 	apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func getAPIServiceHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
diff --git a/pkg/health/health_daemonset.go b/pkg/health/health_daemonset.go
index 76131daf3..099095f96 100644
--- a/pkg/health/health_daemonset.go
+++ b/pkg/health/health_daemonset.go
@@ -3,10 +3,11 @@ package health
 import (
 	"fmt"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func getDaemonSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
diff --git a/pkg/health/health_deployment.go b/pkg/health/health_deployment.go
index 605d5e77f..5b16e35d7 100644
--- a/pkg/health/health_deployment.go
+++ b/pkg/health/health_deployment.go
@@ -3,10 +3,11 @@ package health
 import (
 	"fmt"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func getDeploymentHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
diff --git a/pkg/health/health_job.go b/pkg/health/health_job.go
index 99181f602..c565cc1ce 100644
--- a/pkg/health/health_job.go
+++ b/pkg/health/health_job.go
@@ -5,10 +5,11 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	batchv1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func getJobHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
diff --git a/pkg/health/health_pod.go b/pkg/health/health_pod.go
index 25db283ef..6b7ba55ff 100644
--- a/pkg/health/health_pod.go
+++ b/pkg/health/health_pod.go
@@ -4,11 +4,12 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubectl/pkg/util/podutils"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func getPodHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
diff --git a/pkg/health/health_pvc.go b/pkg/health/health_pvc.go
index 817e31510..31e20ed02 100644
--- a/pkg/health/health_pvc.go
+++ b/pkg/health/health_pvc.go
@@ -3,10 +3,11 @@ package health
 import (
 	"fmt"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func getPVCHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
diff --git a/pkg/health/health_replicaset.go b/pkg/health/health_replicaset.go
index 95b56793b..0c1b1c550 100644
--- a/pkg/health/health_replicaset.go
+++ b/pkg/health/health_replicaset.go
@@ -3,11 +3,12 @@ package health
 import (
 	"fmt"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func getReplicaSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
diff --git a/pkg/health/health_service.go b/pkg/health/health_service.go
index 17d5f3e4c..f69081929 100644
--- a/pkg/health/health_service.go
+++ b/pkg/health/health_service.go
@@ -3,10 +3,11 @@ package health
 import (
 	"fmt"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func getServiceHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
diff --git a/pkg/health/health_statefulset.go b/pkg/health/health_statefulset.go
index 52d156712..deffe66e4 100644
--- a/pkg/health/health_statefulset.go
+++ b/pkg/health/health_statefulset.go
@@ -3,10 +3,11 @@ package health
 import (
 	"fmt"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 func getStatefulSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
diff --git a/pkg/utils/kube/kubetest/mock_resource_operations.go b/pkg/utils/kube/kubetest/mock_resource_operations.go
index 8030e5cca..36698db4a 100644
--- a/pkg/utils/kube/kubetest/mock_resource_operations.go
+++ b/pkg/utils/kube/kubetest/mock_resource_operations.go
@@ -4,13 +4,14 @@ import (
 	"context"
 	"sync"
 
-	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/rest"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
+
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 )
 
 type MockResourceOps struct {