diff --git a/controllers/alert_controller.go b/controllers/alert_controller.go
index 327d613..0838f67 100644
--- a/controllers/alert_controller.go
+++ b/controllers/alert_controller.go
@@ -48,7 +48,7 @@ func (r *AlertReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	log := r.Log.WithValues(strings.ToLower(alert.Kind), req.NamespacedName)
+	log := r.Log.WithValues("controller", strings.ToLower(alert.Kind), "request", req.NamespacedName)
 
 	init := true
 	for _, condition := range alert.Status.Conditions {
diff --git a/controllers/provider_controller.go b/controllers/provider_controller.go
index 740c18c..47faa48 100644
--- a/controllers/provider_controller.go
+++ b/controllers/provider_controller.go
@@ -48,7 +48,7 @@ func (r *ProviderReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	log := r.Log.WithValues(strings.ToLower(provider.Kind), req.NamespacedName)
+	log := r.Log.WithValues("controller", strings.ToLower(provider.Kind), "request", req.NamespacedName)
 
 	init := true
 	for _, condition := range provider.Status.Conditions {
diff --git a/controllers/receiver_controller.go b/controllers/receiver_controller.go
index f3d7593..3ed5159 100644
--- a/controllers/receiver_controller.go
+++ b/controllers/receiver_controller.go
@@ -55,13 +55,12 @@ func (r *ReceiverReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	log := r.Log.WithValues(strings.ToLower(receiver.Kind), req.NamespacedName)
+	log := r.Log.WithValues("controller", strings.ToLower(receiver.Kind), "request", req.NamespacedName)
 
 	token, err := r.token(ctx, receiver)
 	if err != nil {
 		receiver = v1alpha1.ReceiverNotReady(receiver, v1alpha1.TokenNotFoundReason, err.Error())
 		if err := r.Status().Update(ctx, &receiver); err != nil {
-			log.Error(err, "unable to update Receiver status")
 			return ctrl.Result{Requeue: true}, err
 		}
 	}
@@ -85,7 +84,6 @@ func (r *ReceiverReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 		"Receiver initialised with URL: "+receiverURL,
 		receiverURL)
 	if err := r.Status().Update(ctx, &receiver); err != nil {
-		log.Error(err, "unable to update Receiver status")
 		return ctrl.Result{Requeue: true}, err
 	}