diff --git a/.golangci.yaml b/.golangci.yaml
index 27d72893f..6f5fd666c 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -13,6 +13,7 @@ linters:
     - unconvert
     - unparam
     - whitespace
+    - goimports
   disable:
     - errcheck
 
@@ -25,3 +26,7 @@ issues:
     - text: "var-naming: don't use leading k in Go names"
       linters:
         - revive
+
+linters-settings:
+  goimports:
+    local-prefixes: github.com/kuadrant/kuadrant-operator
diff --git a/controllers/kuadrant_status.go b/controllers/kuadrant_status.go
index 60c776009..8bf1564e0 100644
--- a/controllers/kuadrant_status.go
+++ b/controllers/kuadrant_status.go
@@ -15,9 +15,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	authorinov1beta1 "github.com/kuadrant/authorino-operator/api/v1beta1"
+	limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
+
 	kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	"github.com/kuadrant/kuadrant-operator/pkg/common"
-	limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
 )
 
 const (
diff --git a/pkg/istio/mesh_config.go b/pkg/istio/mesh_config.go
index f9d202bf1..532b39f47 100644
--- a/pkg/istio/mesh_config.go
+++ b/pkg/istio/mesh_config.go
@@ -3,7 +3,6 @@ package istio
 import (
 	"fmt"
 
-	maistrav2 "github.com/kuadrant/kuadrant-operator/api/external/maistra/v2"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/structpb"
 	istiomeshv1alpha1 "istio.io/api/mesh/v1alpha1"
@@ -14,6 +13,8 @@ import (
 	istiov1alpha1 "maistra.io/istio-operator/api/v1alpha1"
 	"maistra.io/istio-operator/pkg/helm"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	maistrav2 "github.com/kuadrant/kuadrant-operator/api/external/maistra/v2"
 )
 
 // The structs below implement the interface defined in pkg/common/mesh_config.go `ConfigWrapper`
diff --git a/pkg/kuadranttools/limitador_tools.go b/pkg/kuadranttools/limitador_tools.go
index 4710cc2ec..529facd27 100644
--- a/pkg/kuadranttools/limitador_tools.go
+++ b/pkg/kuadranttools/limitador_tools.go
@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/kuadrant/kuadrant-operator/api/v1beta1"
 )
 
 func LimitadorMutator(existingObj, desiredObj client.Object) (bool, error) {
diff --git a/pkg/rlptools/rate_limit_index.go b/pkg/rlptools/rate_limit_index.go
index 82e38412b..1cb84a4c2 100644
--- a/pkg/rlptools/rate_limit_index.go
+++ b/pkg/rlptools/rate_limit_index.go
@@ -6,9 +6,10 @@ import (
 	"strings"
 
 	"github.com/elliotchance/orderedmap/v2"
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 	limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
 )
 
 type RateLimitIndexKey = client.ObjectKey