diff --git a/pkg/controllers/infra-services-controller.go b/pkg/controllers/infra-services-controller.go
index de55af062a..9d1e23f516 100644
--- a/pkg/controllers/infra-services-controller.go
+++ b/pkg/controllers/infra-services-controller.go
@@ -41,6 +41,7 @@ func (s *InfrastructureServicesManager) Dependencies() []string {
 }
 
 func (s *InfrastructureServicesManager) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error {
+	defer close(stopped)
 	defer close(ready)
 
 	if err := applyDefaultRBACs(ctx, s.cfg); err != nil {
diff --git a/pkg/controllers/kube-apiserver.go b/pkg/controllers/kube-apiserver.go
index 46b4563e20..8e6182862e 100644
--- a/pkg/controllers/kube-apiserver.go
+++ b/pkg/controllers/kube-apiserver.go
@@ -160,6 +160,7 @@ func (s *KubeAPIServer) configure(cfg *config.Config) error {
 			},
 			"enable-admission-plugins":              {},
 			"send-retry-after-while-not-ready-once": {"true"},
+			"shutdown-delay-duration":               {"5s"},
 		},
 		GenericAPIServerConfig: configv1.GenericAPIServerConfig{
 			AdmissionConfig: configv1.AdmissionConfig{
diff --git a/pkg/controllers/openshift-default-scc-manager.go b/pkg/controllers/openshift-default-scc-manager.go
index 5570a07523..a77fb1a027 100644
--- a/pkg/controllers/openshift-default-scc-manager.go
+++ b/pkg/controllers/openshift-default-scc-manager.go
@@ -41,6 +41,7 @@ func (s *OpenShiftDefaultSCCManager) Dependencies() []string {
 }
 
 func (s *OpenShiftDefaultSCCManager) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error {
+	defer close(stopped)
 	defer close(ready)
 	// TO-DO add readiness check
 	if err := ApplyDefaultSCCs(ctx, s.cfg); err != nil {
diff --git a/scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch b/scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch
index e75b2134f9..0647a577cb 100644
--- a/scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch
+++ b/scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch
@@ -16,7 +16,7 @@ index 087b5f50b..092a1bdb5 100644
  
 -			stopCh := server.SetupSignalHandler()
 -			return Run(context.Background(), c.Complete(), stopCh)
-+			return Run(context.Background(), c.Complete(), cmd.Context().Done())
++			return Run(cmd.Context(), c.Complete(), cmd.Context().Done())
  		},
  		Args: func(cmd *cobra.Command, args []string) error {
  			for _, arg := range args {
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go
index 092a1bdb5e..4a175abd91 100644
--- a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go
+++ b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go
@@ -155,7 +155,7 @@ controller, and serviceaccounts controller.`,
 			// add feature enablement metrics
 			utilfeature.DefaultMutableFeatureGate.AddMetrics()
 
-			return Run(context.Background(), c.Complete(), cmd.Context().Done())
+			return Run(cmd.Context(), c.Complete(), cmd.Context().Done())
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {