diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go
index 437d7a12a5..0794eac6db 100644
--- a/pkg/daemons/control/server.go
+++ b/pkg/daemons/control/server.go
@@ -92,6 +92,7 @@ func Server(ctx context.Context, cfg *config.Control) error {
 
 func controllerManager(ctx context.Context, cfg *config.Control, runtime *config.ControlRuntime) error {
 	argsMap := map[string]string{
+		"feature-gates":                    "JobTrackingWithFinalizers=true",
 		"kubeconfig":                       runtime.KubeConfigController,
 		"authorization-kubeconfig":         runtime.KubeConfigController,
 		"authentication-kubeconfig":        runtime.KubeConfigController,
@@ -145,7 +146,9 @@ func scheduler(ctx context.Context, cfg *config.Control, runtime *config.Control
 }
 
 func apiServer(ctx context.Context, cfg *config.Control, runtime *config.ControlRuntime) (authenticator.Request, http.Handler, error) {
-	argsMap := make(map[string]string)
+	argsMap := map[string]string{
+		"feature-gates": "JobTrackingWithFinalizers=true",
+	}
 
 	setupStorageBackend(argsMap, cfg)