diff --git a/pkg/background/generate/cleanup/controller.go b/pkg/background/generate/cleanup/controller.go
index 780e55366d..7428699a84 100644
--- a/pkg/background/generate/cleanup/controller.go
+++ b/pkg/background/generate/cleanup/controller.go
@@ -129,7 +129,7 @@ func (c *Controller) deletePolicy(obj interface{}) {
 			logger.Info("couldn't get object from tombstone", "obj", obj)
 			return
 		}
-		_, ok = tombstone.Obj.(*kyverno.ClusterPolicy)
+		p, ok = tombstone.Obj.(*kyverno.ClusterPolicy)
 		if !ok {
 			logger.Info("Tombstone contained object that is not a Generate Request", "obj", obj)
 			return
@@ -194,8 +194,7 @@ func (c *Controller) deleteUR(obj interface{}) {
 			logger.Info("Couldn't get object from tombstone", "obj", obj)
 			return
 		}
-
-		_, ok = tombstone.Obj.(*urkyverno.UpdateRequest)
+		gr, ok = tombstone.Obj.(*urkyverno.UpdateRequest)
 		if !ok {
 			logger.Info("ombstone contained object that is not a Generate Request", "obj", obj)
 			return
diff --git a/pkg/background/update_request_controller.go b/pkg/background/update_request_controller.go
index 7524576180..5d77a2a960 100644
--- a/pkg/background/update_request_controller.go
+++ b/pkg/background/update_request_controller.go
@@ -320,7 +320,7 @@ func (c *Controller) deleteGR(obj interface{}) {
 			logger.Info("Couldn't get object from tombstone", "obj", obj)
 			return
 		}
-		_, ok = tombstone.Obj.(*kyverno.GenerateRequest)
+		gr, ok = tombstone.Obj.(*kyverno.GenerateRequest)
 		if !ok {
 			logger.Info("tombstone contained object that is not a Generate Request CR", "obj", obj)
 			return
@@ -377,7 +377,7 @@ func (c *Controller) deleteUR(obj interface{}) {
 			logger.Info("Couldn't get object from tombstone", "obj", obj)
 			return
 		}
-		_, ok = tombstone.Obj.(*urkyverno.UpdateRequest)
+		gr, ok = tombstone.Obj.(*urkyverno.UpdateRequest)
 		if !ok {
 			logger.Info("tombstone contained object that is not a Generate Request CR", "obj", obj)
 			return
diff --git a/pkg/config/dynamicconfig.go b/pkg/config/dynamicconfig.go
index 379e92dde5..9d1e200fe9 100644
--- a/pkg/config/dynamicconfig.go
+++ b/pkg/config/dynamicconfig.go
@@ -213,7 +213,7 @@ func (cd *ConfigData) deleteCM(obj interface{}) {
 			logger.Info("failed to get object from tombstone")
 			return
 		}
-		_, ok = tombstone.Obj.(*v1.ConfigMap)
+		cm, ok = tombstone.Obj.(*v1.ConfigMap)
 		if !ok {
 			logger.Info("Tombstone contained object that is not a ConfigMap", "object", obj)
 			return
diff --git a/pkg/policy/policy_controller.go b/pkg/policy/policy_controller.go
index add183dfd5..6039fa5576 100644
--- a/pkg/policy/policy_controller.go
+++ b/pkg/policy/policy_controller.go
@@ -260,7 +260,6 @@ func (pc *PolicyController) deletePolicy(obj interface{}) {
 			logger.Info("couldn't get object from tombstone", "obj", obj)
 			return
 		}
-
 		p, ok = tombstone.Obj.(*kyverno.ClusterPolicy)
 		if !ok {
 			logger.Info("tombstone container object that is not a policy", "obj", obj)
@@ -355,7 +354,6 @@ func (pc *PolicyController) deleteNsPolicy(obj interface{}) {
 			logger.Info("couldn't get object from tombstone", "obj", obj)
 			return
 		}
-
 		p, ok = tombstone.Obj.(*kyverno.Policy)
 		if !ok {
 			logger.Info("tombstone container object that is not a policy", "obj", obj)