diff --git a/pkg/reconciler/pipelinerun/controller.go b/pkg/reconciler/pipelinerun/controller.go
index f081d6c87d..eb79ebbe45 100644
--- a/pkg/reconciler/pipelinerun/controller.go
+++ b/pkg/reconciler/pipelinerun/controller.go
@@ -88,9 +88,11 @@ func NewNamespacesScopedController(namespaces []string) func(ctx context.Context
 
 			return controller.Options{
 				// The chains reconciler shouldn't mutate the pipelinerun's status.
-				SkipStatusUpdates: true,
-				ConfigStore:       cfgStore,
-				FinalizerName:     "chains.tekton.dev/pipelinerun", // TODO: unique name required?
+				SkipStatusUpdates:               true,
+				ConfigStore:                     cfgStore,
+				FinalizerName:                   "chains.tekton.dev/pipelinerun", // TODO: unique name required?
+				UseServerSideApplyForFinalizers: true,
+				FinalizerFieldManager:           "tekton-chains-controller/finalizers",
 			}
 		})
 
diff --git a/pkg/reconciler/taskrun/controller.go b/pkg/reconciler/taskrun/controller.go
index 0783592a17..35783cee78 100644
--- a/pkg/reconciler/taskrun/controller.go
+++ b/pkg/reconciler/taskrun/controller.go
@@ -84,9 +84,11 @@ func NewNamespacesScopedController(namespaces []string) func(ctx context.Context
 
 			return controller.Options{
 				// The chains reconciler shouldn't mutate the taskrun's status.
-				SkipStatusUpdates: true,
-				ConfigStore:       cfgStore,
-				FinalizerName:     "chains.tekton.dev/taskrun",
+				SkipStatusUpdates:               true,
+				ConfigStore:                     cfgStore,
+				FinalizerName:                   "chains.tekton.dev/taskrun",
+				UseServerSideApplyForFinalizers: true,
+				FinalizerFieldManager:           "tekton-chains-controller/finalizers",
 			}
 		})