diff --git a/.golangci.yml b/.golangci.yml
index 0c6243602d..1014e8a37d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -64,3 +64,7 @@ linters-settings:
         alias: ${1}${2}informers
       - pkg: k8s.io/client-go/listers/(\w+)/(v[\w\d]+)
         alias: ${1}${2}listers
+      - pkg: github.com/kyverno/kyverno/pkg/client/informers/externalversions/(\w+)/(v[\w\d]+)
+        alias: ${1}${2}informers
+      - pkg: github.com/kyverno/kyverno/pkg/client/listers/(\w+)/(v[\w\d]+)
+        alias: ${1}${2}listers
diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go
index 7fd63a934d..60bc945df1 100644
--- a/cmd/kyverno/main.go
+++ b/cmd/kyverno/main.go
@@ -21,7 +21,7 @@ import (
 	configcontroller "github.com/kyverno/kyverno/pkg/controllers/config"
 	policycachecontroller "github.com/kyverno/kyverno/pkg/controllers/policycache"
 	"github.com/kyverno/kyverno/pkg/cosign"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	event "github.com/kyverno/kyverno/pkg/event"
 	"github.com/kyverno/kyverno/pkg/leaderelection"
 	"github.com/kyverno/kyverno/pkg/metrics"
diff --git a/pkg/background/common/context.go b/pkg/background/common/context.go
index 17a15cb764..b02745c8e4 100644
--- a/pkg/background/common/context.go
+++ b/pkg/background/common/context.go
@@ -9,7 +9,7 @@ import (
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1"
 	"github.com/kyverno/kyverno/pkg/config"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/engine"
 	"github.com/kyverno/kyverno/pkg/engine/context"
 	utils "github.com/kyverno/kyverno/pkg/utils"
diff --git a/pkg/background/common/resource.go b/pkg/background/common/resource.go
index 53a0edad36..74340b3ef1 100644
--- a/pkg/background/common/resource.go
+++ b/pkg/background/common/resource.go
@@ -7,7 +7,7 @@ import (
 	logr "github.com/go-logr/logr"
 	kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1"
 	"github.com/kyverno/kyverno/pkg/common"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	admissionv1 "k8s.io/api/admission/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/pkg/background/generate/cleanup/cleanup.go b/pkg/background/generate/cleanup/cleanup.go
index e04c0b152a..e4dcac9017 100644
--- a/pkg/background/generate/cleanup/cleanup.go
+++ b/pkg/background/generate/cleanup/cleanup.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/go-logr/logr"
 	kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
diff --git a/pkg/background/generate/cleanup/controller.go b/pkg/background/generate/cleanup/controller.go
index c34c9f949e..a2154cb6a2 100644
--- a/pkg/background/generate/cleanup/controller.go
+++ b/pkg/background/generate/cleanup/controller.go
@@ -7,13 +7,13 @@ import (
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	urkyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1beta1"
-	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
-	urkyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
+	kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernov1beta1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1beta1"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1beta1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
 	pkgCommon "github.com/kyverno/kyverno/pkg/common"
 	"github.com/kyverno/kyverno/pkg/config"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -37,8 +37,8 @@ type Controller struct {
 	// typed client for kyverno CRDs
 	kyvernoClient kyvernoclient.Interface
 
-	pInformer  kyvernoinformer.ClusterPolicyInformer
-	urInformer urkyvernoinformer.UpdateRequestInformer
+	pInformer  kyvernov1informers.ClusterPolicyInformer
+	urInformer kyvernov1beta1informers.UpdateRequestInformer
 
 	// control is used to delete the UR
 	control ControlInterface
@@ -47,13 +47,13 @@ type Controller struct {
 	queue workqueue.RateLimitingInterface
 
 	// pLister can list/get cluster policy from the shared informer's store
-	pLister kyvernolister.ClusterPolicyLister
+	pLister kyvernov1listers.ClusterPolicyLister
 
 	// npLister can list/get namespace policy from the shared informer's store
-	npLister kyvernolister.PolicyLister
+	npLister kyvernov1listers.PolicyLister
 
 	// urLister can list/get update request from the shared informer's store
-	urLister urkyvernolister.UpdateRequestNamespaceLister
+	urLister kyvernov1beta1listers.UpdateRequestNamespaceLister
 
 	// nsLister can list/get namespaces from the shared informer's store
 	nsLister corev1listers.NamespaceLister
@@ -67,9 +67,9 @@ func NewController(
 	kubeClient kubernetes.Interface,
 	kyvernoclient kyvernoclient.Interface,
 	client dclient.Interface,
-	pInformer kyvernoinformer.ClusterPolicyInformer,
-	npInformer kyvernoinformer.PolicyInformer,
-	urInformer urkyvernoinformer.UpdateRequestInformer,
+	pInformer kyvernov1informers.ClusterPolicyInformer,
+	npInformer kyvernov1informers.PolicyInformer,
+	urInformer kyvernov1beta1informers.UpdateRequestInformer,
 	namespaceInformer corev1informers.NamespaceInformer,
 	log logr.Logger,
 ) (*Controller, error) {
diff --git a/pkg/background/generate/generate.go b/pkg/background/generate/generate.go
index 43b5cb4870..649c5abea5 100644
--- a/pkg/background/generate/generate.go
+++ b/pkg/background/generate/generate.go
@@ -16,11 +16,11 @@ import (
 	"github.com/kyverno/kyverno/pkg/autogen"
 	"github.com/kyverno/kyverno/pkg/background/common"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
-	urlister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1beta1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
 	pkgcommon "github.com/kyverno/kyverno/pkg/common"
 	"github.com/kyverno/kyverno/pkg/config"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/engine"
 	"github.com/kyverno/kyverno/pkg/engine/context"
 	"github.com/kyverno/kyverno/pkg/engine/response"
@@ -52,16 +52,16 @@ type GenerateController struct {
 	log logr.Logger
 
 	// urLister can list/get update request from the shared informer's store
-	urLister urlister.UpdateRequestNamespaceLister
+	urLister kyvernov1beta1listers.UpdateRequestNamespaceLister
 
 	// nsLister can list/get namespaces from the shared informer's store
 	nsLister corev1listers.NamespaceLister
 
 	// policyLister can list/get cluster policy from the shared informer's store
-	policyLister kyvernolister.ClusterPolicyLister
+	policyLister kyvernov1listers.ClusterPolicyLister
 
 	// policyLister can list/get Namespace policy from the shared informer's store
-	npolicyLister kyvernolister.PolicyLister
+	npolicyLister kyvernov1listers.PolicyLister
 
 	Config config.Configuration
 }
@@ -70,9 +70,9 @@ type GenerateController struct {
 func NewGenerateController(
 	kyvernoClient kyvernoclient.Interface,
 	client dclient.Interface,
-	policyLister kyvernolister.ClusterPolicyLister,
-	npolicyLister kyvernolister.PolicyLister,
-	urLister urlister.UpdateRequestNamespaceLister,
+	policyLister kyvernov1listers.ClusterPolicyLister,
+	npolicyLister kyvernov1listers.PolicyLister,
+	urLister kyvernov1beta1listers.UpdateRequestNamespaceLister,
 	eventGen event.Interface,
 	nsLister corev1listers.NamespaceLister,
 	log logr.Logger,
diff --git a/pkg/background/mutate/mutate.go b/pkg/background/mutate/mutate.go
index 7b0deeb3ba..732f4029e5 100644
--- a/pkg/background/mutate/mutate.go
+++ b/pkg/background/mutate/mutate.go
@@ -9,10 +9,10 @@ import (
 	kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1"
 	"github.com/kyverno/kyverno/pkg/background/common"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
-	urlister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1beta1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
 	"github.com/kyverno/kyverno/pkg/config"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/engine"
 	"github.com/kyverno/kyverno/pkg/engine/response"
 	engineUtils "github.com/kyverno/kyverno/pkg/engine/utils"
@@ -40,13 +40,13 @@ type MutateExistingController struct {
 	log logr.Logger
 
 	// urLister can list/get update request from the shared informer's store
-	urLister urlister.UpdateRequestNamespaceLister
+	urLister kyvernov1beta1listers.UpdateRequestNamespaceLister
 
 	// policyLister can list/get cluster policy from the shared informer's store
-	policyLister kyvernolister.ClusterPolicyLister
+	policyLister kyvernov1listers.ClusterPolicyLister
 
 	// policyLister can list/get Namespace policy from the shared informer's store
-	npolicyLister kyvernolister.PolicyLister
+	npolicyLister kyvernov1listers.PolicyLister
 
 	Config config.Configuration
 }
@@ -55,9 +55,9 @@ type MutateExistingController struct {
 func NewMutateExistingController(
 	kyvernoClient kyvernoclient.Interface,
 	client dclient.Interface,
-	policyLister kyvernolister.ClusterPolicyLister,
-	npolicyLister kyvernolister.PolicyLister,
-	urLister urlister.UpdateRequestNamespaceLister,
+	policyLister kyvernov1listers.ClusterPolicyLister,
+	npolicyLister kyvernov1listers.PolicyLister,
+	urLister kyvernov1beta1listers.UpdateRequestNamespaceLister,
 	eventGen event.Interface,
 	log logr.Logger,
 	dynamicConfig config.Configuration,
diff --git a/pkg/background/update_request_controller.go b/pkg/background/update_request_controller.go
index a16846093d..433773b2f4 100644
--- a/pkg/background/update_request_controller.go
+++ b/pkg/background/update_request_controller.go
@@ -11,12 +11,12 @@ import (
 	"github.com/kyverno/kyverno/pkg/autogen"
 	common "github.com/kyverno/kyverno/pkg/background/common"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	urkyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1beta1"
-	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
-	urlister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
+	kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernov1beta1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1beta1"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1beta1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
 	"github.com/kyverno/kyverno/pkg/config"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/event"
 	admissionv1 "k8s.io/api/admission/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -41,7 +41,7 @@ type Controller struct {
 	// typed client for Kyverno CRDs
 	kyvernoClient kyvernoclient.Interface
 
-	policyInformer kyvernoinformer.ClusterPolicyInformer
+	policyInformer kyvernov1informers.ClusterPolicyInformer
 
 	// event generator interface
 	eventGen event.Interface
@@ -53,13 +53,13 @@ type Controller struct {
 	queue workqueue.RateLimitingInterface
 
 	// policyLister can list/get cluster policy from the shared informer's store
-	policyLister kyvernolister.ClusterPolicyLister
+	policyLister kyvernov1listers.ClusterPolicyLister
 
 	// policyLister can list/get Namespace policy from the shared informer's store
-	npolicyLister kyvernolister.PolicyLister
+	npolicyLister kyvernov1listers.PolicyLister
 
 	// urLister can list/get update request from the shared informer's store
-	urLister urlister.UpdateRequestNamespaceLister
+	urLister kyvernov1beta1listers.UpdateRequestNamespaceLister
 
 	// nsLister can list/get namespaces from the shared informer's store
 	nsLister corev1listers.NamespaceLister
@@ -74,9 +74,9 @@ func NewController(
 	kubeClient kubernetes.Interface,
 	kyvernoClient kyvernoclient.Interface,
 	client dclient.Interface,
-	policyInformer kyvernoinformer.ClusterPolicyInformer,
-	npolicyInformer kyvernoinformer.PolicyInformer,
-	urInformer urkyvernoinformer.UpdateRequestInformer,
+	policyInformer kyvernov1informers.ClusterPolicyInformer,
+	npolicyInformer kyvernov1informers.PolicyInformer,
+	urInformer kyvernov1beta1informers.UpdateRequestInformer,
 	eventGen event.Interface,
 	namespaceInformer corev1informers.NamespaceInformer,
 	log logr.Logger,
diff --git a/pkg/common/common.go b/pkg/common/common.go
index 1cc4a9f544..558b4a1fdf 100644
--- a/pkg/common/common.go
+++ b/pkg/common/common.go
@@ -8,8 +8,8 @@ import (
 	"github.com/go-logr/logr"
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	urkyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	kyvernov1beta1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	enginutils "github.com/kyverno/kyverno/pkg/engine/utils"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
@@ -79,7 +79,7 @@ func RetryFunc(retryInterval, timeout time.Duration, run func() error, msg strin
 	}
 }
 
-func ProcessDeletePolicyForCloneGenerateRule(policy kyvernov1.PolicyInterface, client dclient.Interface, kyvernoClient kyvernoclient.Interface, urlister urkyvernolister.UpdateRequestNamespaceLister, pName string, logger logr.Logger) bool {
+func ProcessDeletePolicyForCloneGenerateRule(policy kyvernov1.PolicyInterface, client dclient.Interface, kyvernoClient kyvernoclient.Interface, urlister kyvernov1beta1listers.UpdateRequestNamespaceLister, pName string, logger logr.Logger) bool {
 	generatePolicyWithClone := false
 	for _, rule := range policy.GetSpec().Rules {
 		clone, sync := rule.GetCloneSyncForGenerate()
diff --git a/pkg/controllers/policycache/controller.go b/pkg/controllers/policycache/controller.go
index 637ebfa530..2e31295f2b 100644
--- a/pkg/controllers/policycache/controller.go
+++ b/pkg/controllers/policycache/controller.go
@@ -4,8 +4,8 @@ import (
 	"time"
 
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
-	kyvernov1informer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	kyvernov1lister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	pcache "github.com/kyverno/kyverno/pkg/policycache"
 	kubeutils "github.com/kyverno/kyverno/pkg/utils/kube"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -26,14 +26,14 @@ type controller struct {
 	cache pcache.Cache
 
 	// listers
-	cpolLister kyvernov1lister.ClusterPolicyLister
-	polLister  kyvernov1lister.PolicyLister
+	cpolLister kyvernov1listers.ClusterPolicyLister
+	polLister  kyvernov1listers.PolicyLister
 
 	// queue
 	queue workqueue.RateLimitingInterface
 }
 
-func NewController(pcache pcache.Cache, cpolInformer kyvernov1informer.ClusterPolicyInformer, polInformer kyvernov1informer.PolicyInformer) *controller {
+func NewController(pcache pcache.Cache, cpolInformer kyvernov1informers.ClusterPolicyInformer, polInformer kyvernov1informers.PolicyInformer) *controller {
 	c := controller{
 		cache:      pcache,
 		cpolLister: cpolInformer.Lister(),
diff --git a/pkg/event/controller.go b/pkg/event/controller.go
index 4aec4decb6..d1d137543d 100644
--- a/pkg/event/controller.go
+++ b/pkg/event/controller.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
-	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	"github.com/kyverno/kyverno/pkg/dclient"
 	corev1 "k8s.io/api/core/v1"
 	errors "k8s.io/apimachinery/pkg/api/errors"
@@ -23,9 +23,9 @@ import (
 type Generator struct {
 	client dclient.Interface
 	// list/get cluster policy
-	cpLister kyvernolister.ClusterPolicyLister
+	cpLister kyvernov1listers.ClusterPolicyLister
 	// list/get policy
-	pLister kyvernolister.PolicyLister
+	pLister kyvernov1listers.PolicyLister
 	// queue to store event generation requests
 	queue workqueue.RateLimitingInterface
 	// events generated at policy controller
@@ -46,7 +46,7 @@ type Interface interface {
 }
 
 // NewEventGenerator to generate a new event controller
-func NewEventGenerator(client dclient.Interface, cpInformer kyvernoinformer.ClusterPolicyInformer, pInformer kyvernoinformer.PolicyInformer, log logr.Logger) *Generator {
+func NewEventGenerator(client dclient.Interface, cpInformer kyvernov1informers.ClusterPolicyInformer, pInformer kyvernov1informers.PolicyInformer, log logr.Logger) *Generator {
 	gen := Generator{
 		client:                 client,
 		cpLister:               cpInformer.Lister(),
diff --git a/pkg/policy/actions.go b/pkg/policy/actions.go
index cc621073cb..cae1cdf47c 100644
--- a/pkg/policy/actions.go
+++ b/pkg/policy/actions.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/policy/generate"
 	"github.com/kyverno/kyverno/pkg/policy/mutate"
 	"github.com/kyverno/kyverno/pkg/policy/validate"
diff --git a/pkg/policy/generate/auth.go b/pkg/policy/generate/auth.go
index 8fb9f9373e..ab83c4f975 100644
--- a/pkg/policy/generate/auth.go
+++ b/pkg/policy/generate/auth.go
@@ -3,7 +3,7 @@ package generate
 import (
 	"github.com/go-logr/logr"
 	"github.com/kyverno/kyverno/pkg/auth"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 )
 
 // Operations provides methods to performing operations on resource
diff --git a/pkg/policy/generate/validate.go b/pkg/policy/generate/validate.go
index e3d784ba48..37c6e344b1 100644
--- a/pkg/policy/generate/validate.go
+++ b/pkg/policy/generate/validate.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-logr/logr"
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor"
 	"github.com/kyverno/kyverno/pkg/engine/variables"
 	"github.com/kyverno/kyverno/pkg/policy/common"
diff --git a/pkg/policy/policy_controller.go b/pkg/policy/policy_controller.go
index 3896831dc9..07b3ae9c51 100644
--- a/pkg/policy/policy_controller.go
+++ b/pkg/policy/policy_controller.go
@@ -16,10 +16,10 @@ import (
 	"github.com/kyverno/kyverno/pkg/autogen"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
 	"github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
-	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	urkyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1beta1"
-	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
-	urkyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
+	kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernov1beta1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1beta1"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1beta1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
 	"github.com/kyverno/kyverno/pkg/config"
 	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/event"
@@ -55,8 +55,8 @@ const (
 type PolicyController struct {
 	client        dclient.Interface
 	kyvernoClient kyvernoclient.Interface
-	pInformer     kyvernoinformer.ClusterPolicyInformer
-	npInformer    kyvernoinformer.PolicyInformer
+	pInformer     kyvernov1informers.ClusterPolicyInformer
+	npInformer    kyvernov1informers.PolicyInformer
 
 	eventGen      event.Interface
 	eventRecorder record.EventRecorder
@@ -65,13 +65,13 @@ type PolicyController struct {
 	queue workqueue.RateLimitingInterface
 
 	// pLister can list/get policy from the shared informer's store
-	pLister kyvernolister.ClusterPolicyLister
+	pLister kyvernov1listers.ClusterPolicyLister
 
 	// npLister can list/get namespace policy from the shared informer's store
-	npLister kyvernolister.PolicyLister
+	npLister kyvernov1listers.PolicyLister
 
 	// urLister can list/get update request from the shared informer's store
-	urLister urkyvernolister.UpdateRequestLister
+	urLister kyvernov1beta1listers.UpdateRequestLister
 
 	// nsLister can list/get namespaces from the shared informer's store
 	nsLister corev1listers.NamespaceLister
@@ -99,9 +99,9 @@ func NewPolicyController(
 	kubeClient kubernetes.Interface,
 	kyvernoClient kyvernoclient.Interface,
 	client dclient.Interface,
-	pInformer kyvernoinformer.ClusterPolicyInformer,
-	npInformer kyvernoinformer.PolicyInformer,
-	urInformer urkyvernoinformer.UpdateRequestInformer,
+	pInformer kyvernov1informers.ClusterPolicyInformer,
+	npInformer kyvernov1informers.PolicyInformer,
+	urInformer kyvernov1beta1informers.UpdateRequestInformer,
 	configHandler config.Configuration,
 	eventGen event.Interface,
 	prGenerator policyreport.GeneratorInterface,
diff --git a/pkg/policy/report.go b/pkg/policy/report.go
index 8d34ad49db..ce7db72fa8 100644
--- a/pkg/policy/report.go
+++ b/pkg/policy/report.go
@@ -9,8 +9,8 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/kyverno/kyverno/api/policyreport/v1alpha2"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	changerequestlister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1alpha2"
-	policyreportlister "github.com/kyverno/kyverno/pkg/client/listers/policyreport/v1alpha2"
+	kyvernov1alpha2listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1alpha2"
+	policyreportv1alpha2listers "github.com/kyverno/kyverno/pkg/client/listers/policyreport/v1alpha2"
 	"github.com/kyverno/kyverno/pkg/config"
 	"github.com/kyverno/kyverno/pkg/engine/response"
 	"github.com/kyverno/kyverno/pkg/event"
@@ -78,7 +78,7 @@ func (pc *PolicyController) forceReconciliation(reconcileCh <-chan bool, stopCh
 	}
 }
 
-func cleanupReportChangeRequests(pclient kyvernoclient.Interface, rcrLister changerequestlister.ReportChangeRequestLister, crcrLister changerequestlister.ClusterReportChangeRequestLister) error {
+func cleanupReportChangeRequests(pclient kyvernoclient.Interface, rcrLister kyvernov1alpha2listers.ReportChangeRequestLister, crcrLister kyvernov1alpha2listers.ClusterReportChangeRequestLister) error {
 	var errors []string
 
 	var gracePeriod int64 = 0
@@ -101,7 +101,7 @@ func cleanupReportChangeRequests(pclient kyvernoclient.Interface, rcrLister chan
 	return fmt.Errorf("%v", strings.Join(errors, ";"))
 }
 
-func eraseResultsEntries(pclient kyvernoclient.Interface, reportLister policyreportlister.PolicyReportLister, clusterReportLister policyreportlister.ClusterPolicyReportLister) error {
+func eraseResultsEntries(pclient kyvernoclient.Interface, reportLister policyreportv1alpha2listers.PolicyReportLister, clusterReportLister policyreportv1alpha2listers.ClusterPolicyReportLister) error {
 	selector, err := metav1.LabelSelectorAsSelector(policyreport.LabelSelector)
 	if err != nil {
 		return fmt.Errorf("failed to erase results entries %v", err)
diff --git a/pkg/policy/validate.go b/pkg/policy/validate.go
index 5454539221..6da5aa4aed 100644
--- a/pkg/policy/validate.go
+++ b/pkg/policy/validate.go
@@ -14,7 +14,7 @@ import (
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/common"
 	"github.com/kyverno/kyverno/pkg/autogen"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/engine"
 	"github.com/kyverno/kyverno/pkg/engine/context"
 	"github.com/kyverno/kyverno/pkg/engine/variables"
diff --git a/pkg/policyreport/builder.go b/pkg/policyreport/builder.go
index f0586f2994..d6bec791be 100644
--- a/pkg/policyreport/builder.go
+++ b/pkg/policyreport/builder.go
@@ -10,7 +10,7 @@ import (
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	kyvernov1alpha2 "github.com/kyverno/kyverno/api/kyverno/v1alpha2"
 	policyreportv1alpha2 "github.com/kyverno/kyverno/api/policyreport/v1alpha2"
-	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	"github.com/kyverno/kyverno/pkg/config"
 	"github.com/kyverno/kyverno/pkg/engine"
 	"github.com/kyverno/kyverno/pkg/engine/response"
@@ -84,12 +84,12 @@ type Builder interface {
 }
 
 type requestBuilder struct {
-	cpolLister kyvernolister.ClusterPolicyLister
-	polLister  kyvernolister.PolicyLister
+	cpolLister kyvernov1listers.ClusterPolicyLister
+	polLister  kyvernov1listers.PolicyLister
 }
 
 // NewBuilder ...
-func NewBuilder(cpolLister kyvernolister.ClusterPolicyLister, polLister kyvernolister.PolicyLister) Builder {
+func NewBuilder(cpolLister kyvernov1listers.ClusterPolicyLister, polLister kyvernov1listers.PolicyLister) Builder {
 	return &requestBuilder{cpolLister: cpolLister, polLister: polLister}
 }
 
diff --git a/pkg/policyreport/policyreport.go b/pkg/policyreport/policyreport.go
index 283d17c0a7..f49064707c 100644
--- a/pkg/policyreport/policyreport.go
+++ b/pkg/policyreport/policyreport.go
@@ -10,8 +10,8 @@ import (
 	kyvernov1alpha2 "github.com/kyverno/kyverno/api/kyverno/v1alpha2"
 	policyreportv1alpha2 "github.com/kyverno/kyverno/api/policyreport/v1alpha2"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	changerequestlister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1alpha2"
-	policyreportlister "github.com/kyverno/kyverno/pkg/client/listers/policyreport/v1alpha2"
+	kyvernov1alpha2listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1alpha2"
+	policyreportv1alpha2listers "github.com/kyverno/kyverno/pkg/client/listers/policyreport/v1alpha2"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
@@ -21,8 +21,8 @@ type PolicyReportEraser interface {
 }
 
 type (
-	CleanupReportChangeRequests = func(pclient kyvernoclient.Interface, rcrLister changerequestlister.ReportChangeRequestLister, crcrLister changerequestlister.ClusterReportChangeRequestLister) error
-	EraseResultsEntries         = func(pclient kyvernoclient.Interface, reportLister policyreportlister.PolicyReportLister, clusterReportLister policyreportlister.ClusterPolicyReportLister) error
+	CleanupReportChangeRequests = func(pclient kyvernoclient.Interface, rcrLister kyvernov1alpha2listers.ReportChangeRequestLister, crcrLister kyvernov1alpha2listers.ClusterReportChangeRequestLister) error
+	EraseResultsEntries         = func(pclient kyvernoclient.Interface, reportLister policyreportv1alpha2listers.PolicyReportLister, clusterReportLister policyreportv1alpha2listers.ClusterPolicyReportLister) error
 )
 
 func (g *ReportGenerator) CleanupReportChangeRequests(cleanup CleanupReportChangeRequests) error {
diff --git a/pkg/policyreport/reportcontroller.go b/pkg/policyreport/reportcontroller.go
index 7f1c7abe95..aa75ccffed 100644
--- a/pkg/policyreport/reportcontroller.go
+++ b/pkg/policyreport/reportcontroller.go
@@ -11,12 +11,12 @@ import (
 	kyvernov1alpha2 "github.com/kyverno/kyverno/api/kyverno/v1alpha2"
 	policyreportv1alpha2 "github.com/kyverno/kyverno/api/policyreport/v1alpha2"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	requestinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1alpha2"
-	policyreportinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/policyreport/v1alpha2"
-	requestlister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1alpha2"
-	policyreport "github.com/kyverno/kyverno/pkg/client/listers/policyreport/v1alpha2"
+	kyvernov1alpha2informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1alpha2"
+	policyreportv1alpha2informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/policyreport/v1alpha2"
+	kyvernov1alpha2listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1alpha2"
+	policyreportv1alpha2listers "github.com/kyverno/kyverno/pkg/client/listers/policyreport/v1alpha2"
 	"github.com/kyverno/kyverno/pkg/config"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	kubeutils "github.com/kyverno/kyverno/pkg/utils/kube"
 	"github.com/kyverno/kyverno/pkg/version"
 	corev1 "k8s.io/api/core/v1"
@@ -51,17 +51,17 @@ var LabelSelector = &metav1.LabelSelector{
 // ReportGenerator creates policy report
 type ReportGenerator struct {
 	pclient kyvernoclient.Interface
-	dclient dclient.Interface
+	client  dclient.Interface
 
-	clusterReportInformer    policyreportinformer.ClusterPolicyReportInformer
-	reportInformer           policyreportinformer.PolicyReportInformer
-	reportReqInformer        requestinformer.ReportChangeRequestInformer
-	clusterReportReqInformer requestinformer.ClusterReportChangeRequestInformer
+	clusterReportInformer    policyreportv1alpha2informers.ClusterPolicyReportInformer
+	reportInformer           policyreportv1alpha2informers.PolicyReportInformer
+	reportReqInformer        kyvernov1alpha2informers.ReportChangeRequestInformer
+	clusterReportReqInformer kyvernov1alpha2informers.ClusterReportChangeRequestInformer
 
-	reportLister                     policyreport.PolicyReportLister
-	clusterReportLister              policyreport.ClusterPolicyReportLister
-	reportChangeRequestLister        requestlister.ReportChangeRequestLister
-	clusterReportChangeRequestLister requestlister.ClusterReportChangeRequestLister
+	reportLister                     policyreportv1alpha2listers.PolicyReportLister
+	clusterReportLister              policyreportv1alpha2listers.ClusterPolicyReportLister
+	reportChangeRequestLister        kyvernov1alpha2listers.ReportChangeRequestLister
+	clusterReportChangeRequestLister kyvernov1alpha2listers.ClusterReportChangeRequestLister
 	nsLister                         corev1listers.NamespaceLister
 
 	queue workqueue.RateLimitingInterface
@@ -77,16 +77,16 @@ type ReportGenerator struct {
 func NewReportGenerator(
 	pclient kyvernoclient.Interface,
 	dclient dclient.Interface,
-	clusterReportInformer policyreportinformer.ClusterPolicyReportInformer,
-	reportInformer policyreportinformer.PolicyReportInformer,
-	reportReqInformer requestinformer.ReportChangeRequestInformer,
-	clusterReportReqInformer requestinformer.ClusterReportChangeRequestInformer,
+	clusterReportInformer policyreportv1alpha2informers.ClusterPolicyReportInformer,
+	reportInformer policyreportv1alpha2informers.PolicyReportInformer,
+	reportReqInformer kyvernov1alpha2informers.ReportChangeRequestInformer,
+	clusterReportReqInformer kyvernov1alpha2informers.ClusterReportChangeRequestInformer,
 	namespace corev1informers.NamespaceInformer,
 	log logr.Logger,
 ) (*ReportGenerator, error) {
 	gen := &ReportGenerator{
 		pclient:                  pclient,
-		dclient:                  dclient,
+		client:                   dclient,
 		clusterReportInformer:    clusterReportInformer,
 		reportInformer:           reportInformer,
 		reportReqInformer:        reportReqInformer,
@@ -464,7 +464,7 @@ func (g *ReportGenerator) removeFromClusterPolicyReport(policyName, ruleName str
 }
 
 func (g *ReportGenerator) removeFromPolicyReport(policyName, ruleName string) error {
-	namespaces, err := g.dclient.ListResource("", "Namespace", "", nil)
+	namespaces, err := g.client.ListResource("", "Namespace", "", nil)
 	if err != nil {
 		return fmt.Errorf("unable to list namespace %v", err)
 	}
diff --git a/pkg/policyreport/reportrequest.go b/pkg/policyreport/reportrequest.go
index af71e91419..686811506f 100644
--- a/pkg/policyreport/reportrequest.go
+++ b/pkg/policyreport/reportrequest.go
@@ -11,11 +11,11 @@ import (
 	"github.com/go-logr/logr"
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	requestinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1alpha2"
-	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
-	requestlister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1alpha2"
-	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernov1alpha2informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1alpha2"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1alpha2listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1alpha2"
+	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/engine/response"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -31,15 +31,15 @@ const (
 type Generator struct {
 	dclient dclient.Interface
 
-	reportChangeRequestLister requestlister.ReportChangeRequestLister
+	reportChangeRequestLister kyvernov1alpha2listers.ReportChangeRequestLister
 
-	clusterReportChangeRequestLister requestlister.ClusterReportChangeRequestLister
+	clusterReportChangeRequestLister kyvernov1alpha2listers.ClusterReportChangeRequestLister
 
 	// cpolLister can list/get policy from the shared informer's store
-	cpolLister kyvernolister.ClusterPolicyLister
+	cpolLister kyvernov1listers.ClusterPolicyLister
 
 	// polLister can list/get namespace policy from the shared informer's store
-	polLister kyvernolister.PolicyLister
+	polLister kyvernov1listers.PolicyLister
 
 	queue     workqueue.RateLimitingInterface
 	dataStore *dataStore
@@ -52,10 +52,10 @@ type Generator struct {
 // NewReportChangeRequestGenerator returns a new instance of report request generator
 func NewReportChangeRequestGenerator(client kyvernoclient.Interface,
 	dclient dclient.Interface,
-	reportReqInformer requestinformer.ReportChangeRequestInformer,
-	clusterReportReqInformer requestinformer.ClusterReportChangeRequestInformer,
-	cpolInformer kyvernoinformer.ClusterPolicyInformer,
-	polInformer kyvernoinformer.PolicyInformer,
+	reportReqInformer kyvernov1alpha2informers.ReportChangeRequestInformer,
+	clusterReportReqInformer kyvernov1alpha2informers.ClusterReportChangeRequestInformer,
+	cpolInformer kyvernov1informers.ClusterPolicyInformer,
+	polInformer kyvernov1informers.PolicyInformer,
 	log logr.Logger,
 ) *Generator {
 	gen := Generator{
diff --git a/pkg/webhookconfig/configmanager.go b/pkg/webhookconfig/configmanager.go
index af89b5deb7..9900ea80dd 100644
--- a/pkg/webhookconfig/configmanager.go
+++ b/pkg/webhookconfig/configmanager.go
@@ -12,8 +12,8 @@ import (
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	"github.com/kyverno/kyverno/pkg/autogen"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernov1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	"github.com/kyverno/kyverno/pkg/config"
 	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/utils"
@@ -44,14 +44,14 @@ type webhookConfigManager struct {
 	kyvernoClient   kyvernoclient.Interface
 
 	// informers
-	pInformer        kyvernoinformer.ClusterPolicyInformer
-	npInformer       kyvernoinformer.PolicyInformer
+	pInformer        kyvernov1informers.ClusterPolicyInformer
+	npInformer       kyvernov1informers.PolicyInformer
 	mutateInformer   admissionregistrationv1informers.MutatingWebhookConfigurationInformer
 	validateInformer admissionregistrationv1informers.ValidatingWebhookConfigurationInformer
 
 	// listers
-	pLister        kyvernolister.ClusterPolicyLister
-	npLister       kyvernolister.PolicyLister
+	pLister        kyvernov1listers.ClusterPolicyLister
+	npLister       kyvernov1listers.PolicyLister
 	mutateLister   admissionregistrationv1listers.MutatingWebhookConfigurationLister
 	validateLister admissionregistrationv1listers.ValidatingWebhookConfigurationLister
 
@@ -80,8 +80,8 @@ func newWebhookConfigManager(
 	discoveryClient dclient.IDiscovery,
 	kubeClient kubernetes.Interface,
 	kyvernoClient kyvernoclient.Interface,
-	pInformer kyvernoinformer.ClusterPolicyInformer,
-	npInformer kyvernoinformer.PolicyInformer,
+	pInformer kyvernov1informers.ClusterPolicyInformer,
+	npInformer kyvernov1informers.PolicyInformer,
 	mwcInformer admissionregistrationv1informers.MutatingWebhookConfigurationInformer,
 	vwcInformer admissionregistrationv1informers.ValidatingWebhookConfigurationInformer,
 	serverIP string,
diff --git a/pkg/webhookconfig/registration.go b/pkg/webhookconfig/registration.go
index ecd18ba665..31f2276584 100644
--- a/pkg/webhookconfig/registration.go
+++ b/pkg/webhookconfig/registration.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/go-logr/logr"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernov1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
 	"github.com/kyverno/kyverno/pkg/config"
 	"github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/kyverno/kyverno/pkg/utils"
@@ -72,8 +72,8 @@ func NewRegister(
 	mwcInformer admissionregistrationv1informers.MutatingWebhookConfigurationInformer,
 	vwcInformer admissionregistrationv1informers.ValidatingWebhookConfigurationInformer,
 	kDeplInformer appsv1informers.DeploymentInformer,
-	pInformer kyvernoinformer.ClusterPolicyInformer,
-	npInformer kyvernoinformer.PolicyInformer,
+	pInformer kyvernov1informers.ClusterPolicyInformer,
+	npInformer kyvernov1informers.PolicyInformer,
 	serverIP string,
 	webhookTimeout int32,
 	debug bool,
diff --git a/pkg/webhooks/resource/handlers.go b/pkg/webhooks/resource/handlers.go
index 1e71dd2569..fda4258d6f 100644
--- a/pkg/webhooks/resource/handlers.go
+++ b/pkg/webhooks/resource/handlers.go
@@ -10,7 +10,7 @@ import (
 	kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1"
 	kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	urlister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
+	kyvernov1beta1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
 	"github.com/kyverno/kyverno/pkg/common"
 	"github.com/kyverno/kyverno/pkg/config"
 	"github.com/kyverno/kyverno/pkg/dclient"
@@ -54,7 +54,7 @@ type handlers struct {
 	nsLister  corev1listers.NamespaceLister
 	rbLister  rbacv1listers.RoleBindingLister
 	crbLister rbacv1listers.ClusterRoleBindingLister
-	urLister  urlister.UpdateRequestNamespaceLister
+	urLister  kyvernov1beta1listers.UpdateRequestNamespaceLister
 
 	prGenerator       policyreport.GeneratorInterface
 	urGenerator       webhookgenerate.Interface
@@ -73,7 +73,7 @@ func NewHandlers(
 	nsLister corev1listers.NamespaceLister,
 	rbLister rbacv1listers.RoleBindingLister,
 	crbLister rbacv1listers.ClusterRoleBindingLister,
-	urLister urlister.UpdateRequestNamespaceLister,
+	urLister kyvernov1beta1listers.UpdateRequestNamespaceLister,
 	prGenerator policyreport.GeneratorInterface,
 	urGenerator webhookgenerate.Interface,
 	eventGen event.Interface,
diff --git a/pkg/webhooks/updaterequest/generator.go b/pkg/webhooks/updaterequest/generator.go
index cfb0ddf6cf..6c89d2eb0e 100644
--- a/pkg/webhooks/updaterequest/generator.go
+++ b/pkg/webhooks/updaterequest/generator.go
@@ -9,8 +9,8 @@ import (
 	"github.com/go-logr/logr"
 	kyvernov1beta1 "github.com/kyverno/kyverno/api/kyverno/v1beta1"
 	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
-	urkyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1beta1"
-	urkyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
+	kyvernov1beta1informers "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1beta1"
+	kyvernov1beta1listers "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1beta1"
 	"github.com/kyverno/kyverno/pkg/config"
 	admissionv1 "k8s.io/api/admission/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -36,11 +36,11 @@ type Generator struct {
 	stopCh <-chan struct{}
 	log    logr.Logger
 
-	urLister urkyvernolister.UpdateRequestNamespaceLister
+	urLister kyvernov1beta1listers.UpdateRequestNamespaceLister
 }
 
 // NewGenerator returns a new instance of UpdateRequest resource generator
-func NewGenerator(client kyvernoclient.Interface, urInformer urkyvernoinformer.UpdateRequestInformer, stopCh <-chan struct{}, log logr.Logger) *Generator {
+func NewGenerator(client kyvernoclient.Interface, urInformer kyvernov1beta1informers.UpdateRequestInformer, stopCh <-chan struct{}, log logr.Logger) *Generator {
 	gen := &Generator{
 		client:   client,
 		stopCh:   stopCh,
@@ -94,7 +94,7 @@ func retryApplyResource(
 	urSpec kyvernov1beta1.UpdateRequestSpec,
 	log logr.Logger,
 	action admissionv1.Operation,
-	urLister urkyvernolister.UpdateRequestNamespaceLister,
+	urLister kyvernov1beta1listers.UpdateRequestNamespaceLister,
 ) error {
 	if action == admissionv1.Delete && urSpec.Type == kyvernov1beta1.Generate {
 		return nil