diff --git a/.golangci.yaml b/.golangci.yaml
index 90eb78d..32920a7 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -47,10 +47,14 @@ linters-settings:
     local-prefixes: github.com/argoproj/gitops-engine
   importas:
     alias:
+      - alias: appsv1
+        pkg: k8s.io/api/apps/v1
       - alias: corev1
         pkg: k8s.io/api/core/v1
       - alias: apierrors
         pkg: k8s.io/apimachinery/pkg/api/errors
+      - alias: apiextensionsv1
+        pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
       - alias: metav1
         pkg: k8s.io/apimachinery/pkg/apis/meta/v1
       - alias: testingutils
@@ -93,7 +97,6 @@ linters-settings:
       - name: identical-branches
       - name: if-return
       - name: increment-decrement
-        disabled: true
       - name: indent-error-flow
         arguments:
           - 'preserveScope'
@@ -104,7 +107,6 @@ linters-settings:
       - name: redefines-builtin-id
         disabled: true
       - name: redundant-import-alias
-        disabled: true
       - name: superfluous-else
         arguments:
           - 'preserveScope'
diff --git a/pkg/cache/cluster.go b/pkg/cache/cluster.go
index f1a408d..626c70e 100644
--- a/pkg/cache/cluster.go
+++ b/pkg/cache/cluster.go
@@ -12,7 +12,7 @@ import (
 	"github.com/go-logr/logr"
 	"golang.org/x/sync/semaphore"
 	authorizationv1 "k8s.io/api/authorization/v1"
-	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -607,7 +607,7 @@ func (c *clusterCache) listResources(ctx context.Context, resClient dynamic.Reso
 			if ierr != nil {
 				// Log out a retry
 				if c.listRetryLimit > 1 && c.listRetryFunc(ierr) {
-					retryCount += 1
+					retryCount++
 					c.log.Info(fmt.Sprintf("Error while listing resources: %v (try %d/%d)", ierr, retryCount, c.listRetryLimit))
 				}
 				return ierr
@@ -718,7 +718,7 @@ func (c *clusterCache) watchEvents(ctx context.Context, api kube.APIResourceInfo
 				c.recordEvent(event.Type, obj)
 				if kube.IsCRD(obj) {
 					var resources []kube.APIResourceInfo
-					crd := v1.CustomResourceDefinition{}
+					crd := apiextensionsv1.CustomResourceDefinition{}
 					err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &crd)
 					if err != nil {
 						c.log.Error(err, "Failed to extract CRD resources")
@@ -734,7 +734,7 @@ func (c *clusterCache) watchEvents(ctx context.Context, api kube.APIResourceInfo
 							Meta: metav1.APIResource{
 								Group:        crd.Spec.Group,
 								SingularName: crd.Spec.Names.Singular,
-								Namespaced:   crd.Spec.Scope == v1.NamespaceScoped,
+								Namespaced:   crd.Spec.Scope == apiextensionsv1.NamespaceScoped,
 								Name:         crd.Spec.Names.Plural,
 								Kind:         crd.Spec.Names.Singular,
 								Version:      v.Name,
diff --git a/pkg/cache/references.go b/pkg/cache/references.go
index 79b53a7..5217b9a 100644
--- a/pkg/cache/references.go
+++ b/pkg/cache/references.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"regexp"
 
-	v1 "k8s.io/api/apps/v1"
+	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
@@ -60,7 +60,7 @@ func (c *clusterCache) resolveResourceReferences(un *unstructured.Unstructured)
 }
 
 func isStatefulSetChild(un *unstructured.Unstructured) (func(kube.ResourceKey) bool, error) {
-	sts := v1.StatefulSet{}
+	sts := appsv1.StatefulSet{}
 	data, err := json.Marshal(un)
 	if err != nil {
 		return nil, err
diff --git a/pkg/sync/sync_context.go b/pkg/sync/sync_context.go
index 9298e49..5bbf87a 100644
--- a/pkg/sync/sync_context.go
+++ b/pkg/sync/sync_context.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
-	v1extensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -937,8 +937,8 @@ func (sc *syncContext) ensureCRDReady(name string) error {
 			return false, err
 		}
 		for _, condition := range crd.Status.Conditions {
-			if condition.Type == v1extensions.Established {
-				return condition.Status == v1extensions.ConditionTrue, nil
+			if condition.Type == apiextensionsv1.Established {
+				return condition.Status == apiextensionsv1.ConditionTrue, nil
 			}
 		}
 		return false, nil
diff --git a/pkg/sync/sync_context_test.go b/pkg/sync/sync_context_test.go
index dca3a00..f4319ec 100644
--- a/pkg/sync/sync_context_test.go
+++ b/pkg/sync/sync_context_test.go
@@ -1313,7 +1313,7 @@ func TestRunSync_HooksNotDeletedIfPhaseNotCompleted(t *testing.T) {
 	syncCtx.dynamicIf = fakeDynamicClient
 	deletedCount := 0
 	fakeDynamicClient.PrependReactor("delete", "*", func(_ testcore.Action) (handled bool, ret runtime.Object, err error) {
-		deletedCount += 1
+		deletedCount++
 		return true, nil, nil
 	})
 	syncCtx.resources = groupResources(ReconciliationResult{
@@ -1359,7 +1359,7 @@ func TestRunSync_HooksDeletedAfterPhaseCompleted(t *testing.T) {
 	syncCtx.dynamicIf = fakeDynamicClient
 	deletedCount := 0
 	fakeDynamicClient.PrependReactor("delete", "*", func(_ testcore.Action) (handled bool, ret runtime.Object, err error) {
-		deletedCount += 1
+		deletedCount++
 		return true, nil, nil
 	})
 	syncCtx.resources = groupResources(ReconciliationResult{
@@ -1405,7 +1405,7 @@ func TestRunSync_HooksDeletedAfterPhaseCompletedFailed(t *testing.T) {
 	syncCtx.dynamicIf = fakeDynamicClient
 	deletedCount := 0
 	fakeDynamicClient.PrependReactor("delete", "*", func(_ testcore.Action) (handled bool, ret runtime.Object, err error) {
-		deletedCount += 1
+		deletedCount++
 		return true, nil, nil
 	})
 	syncCtx.resources = groupResources(ReconciliationResult{