diff --git a/Makefile b/Makefile
index f3d02adc6c..2999002d0e 100644
--- a/Makefile
+++ b/Makefile
@@ -668,7 +668,7 @@ kind-deploy-kyverno: kind-load-all ## Build images, load them in kind cluster an
 		--set image.tag=$(IMAGE_TAG_DEV) \
 		--set initImage.repository=$(LOCAL_KYVERNOPRE_IMAGE) \
 		--set initImage.tag=$(IMAGE_TAG_DEV) \
-		--set "extraArgs={--autogenInternals=true,--loggingFormat=json}"
+		--set "extraArgs={--autogenInternals=true,--loggingFormat=text}"
 	@echo Restart kyverno pods... >&2
 	@kubectl rollout restart deployment -n kyverno kyverno
 
diff --git a/cmd/cli/kubectl-kyverno/apply/apply_command.go b/cmd/cli/kubectl-kyverno/apply/apply_command.go
index eec8f5a365..b1af3be4c0 100644
--- a/cmd/cli/kubectl-kyverno/apply/apply_command.go
+++ b/cmd/cli/kubectl-kyverno/apply/apply_command.go
@@ -1,6 +1,7 @@
 package apply
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -199,7 +200,7 @@ func (c *ApplyCommandConfig) applyCommandHelper() (rc *common.ResultCounts, reso
 		if err != nil {
 			return rc, resources, skipInvalidPolicies, pvInfos, err
 		}
-		dClient, err = dclient.NewClient(restConfig, kubeClient, nil, 15*time.Minute, make(chan struct{}))
+		dClient, err = dclient.NewClient(context.Background(), restConfig, kubeClient, nil, 15*time.Minute)
 		if err != nil {
 			return rc, resources, skipInvalidPolicies, pvInfos, err
 		}
diff --git a/cmd/initContainer/main.go b/cmd/initContainer/main.go
index 1c67107d9d..7ca2cded8f 100644
--- a/cmd/initContainer/main.go
+++ b/cmd/initContainer/main.go
@@ -82,7 +82,7 @@ func main() {
 
 	// DYNAMIC CLIENT
 	// - client for all registered resources
-	client, err := dclient.NewClient(clientConfig, kubeClient, nil, 15*time.Minute, stopCh)
+	client, err := dclient.NewClient(signalCtx, clientConfig, kubeClient, nil, 15*time.Minute)
 	if err != nil {
 		setupLog.Error(err, "Failed to create client")
 		os.Exit(1)
@@ -102,7 +102,6 @@ func main() {
 	requests := []request{
 		{policyReportKind},
 		{clusterPolicyReportKind},
-
 		{convertGenerateRequest},
 	}
 
@@ -139,7 +138,7 @@ func main() {
 			os.Exit(1)
 		}
 
-		// use pipline to pass request to cleanup resources
+		// use pipeline to pass request to cleanup resources
 		in := gen(done, stopCh, requests...)
 		// process requests
 		// processing routine count : 2
diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go
index fd066de820..480ee06e61 100644
--- a/cmd/kyverno/main.go
+++ b/cmd/kyverno/main.go
@@ -204,7 +204,7 @@ func main() {
 		logger.Error(err, "Failed to create client")
 		os.Exit(1)
 	}
-	dynamicClient, err := dclient.NewClient(clientConfig, kubeClient, metricsConfig, metadataResyncPeriod, stopCh)
+	dynamicClient, err := dclient.NewClient(signalCtx, clientConfig, kubeClient, metricsConfig, metadataResyncPeriod)
 	if err != nil {
 		logger.Error(err, "Failed to create dynamic client")
 		os.Exit(1)
diff --git a/pkg/clients/dclient/client.go b/pkg/clients/dclient/client.go
index 0261e1a438..d89a7ddf50 100644
--- a/pkg/clients/dclient/client.go
+++ b/pkg/clients/dclient/client.go
@@ -63,7 +63,7 @@ type client struct {
 }
 
 // NewClient creates new instance of client
-func NewClient(config *rest.Config, kclient *kubernetes.Clientset, metricsConfig metrics.MetricsConfigManager, resync time.Duration, stopCh <-chan struct{}) (Interface, error) {
+func NewClient(ctx context.Context, config *rest.Config, kclient *kubernetes.Clientset, metricsConfig metrics.MetricsConfigManager, resync time.Duration) (Interface, error) {
 	dclient, err := dynamic.NewForConfig(config)
 	if err != nil {
 		return nil, err
@@ -88,7 +88,7 @@ func NewClient(config *rest.Config, kclient *kubernetes.Clientset, metricsConfig
 	// we will be invalidating the local cache, so the next request get a fresh cache
 	// If a resource is removed then and cache is not invalidate yet, we will not detect the removal
 	// but the re-sync shall re-evaluate
-	go discoveryClient.Poll(resync, stopCh)
+	go discoveryClient.Poll(ctx, resync)
 	client.SetDiscovery(discoveryClient)
 	return &client, nil
 }
diff --git a/pkg/clients/dclient/discovery.go b/pkg/clients/dclient/discovery.go
index 244e269218..b91f613d7c 100644
--- a/pkg/clients/dclient/discovery.go
+++ b/pkg/clients/dclient/discovery.go
@@ -1,6 +1,7 @@
 package dclient
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"time"
@@ -40,7 +41,7 @@ func (c serverPreferredResources) DiscoveryInterface() discovery.DiscoveryInterf
 }
 
 // Poll will keep invalidate the local cache
-func (c serverPreferredResources) Poll(resync time.Duration, stopCh <-chan struct{}) {
+func (c serverPreferredResources) Poll(ctx context.Context, resync time.Duration) {
 	logger := logger.WithName("Poll")
 	// start a ticker
 	ticker := time.NewTicker(resync)
@@ -48,7 +49,7 @@ func (c serverPreferredResources) Poll(resync time.Duration, stopCh <-chan struc
 	logger.V(4).Info("starting registered resources sync", "period", resync)
 	for {
 		select {
-		case <-stopCh:
+		case <-ctx.Done():
 			logger.Info("stopping registered resources sync")
 			return
 		case <-ticker.C: