diff --git a/internal/cmd/controller/gitops/operator.go b/internal/cmd/controller/gitops/operator.go
index d2baee6206..73a635ab03 100644
--- a/internal/cmd/controller/gitops/operator.go
+++ b/internal/cmd/controller/gitops/operator.go
@@ -119,12 +119,13 @@ func (g *GitOperator) Run(cmd *cobra.Command, args []string) error {
 		ShardID:   g.ShardID,
 	}
 
-	group := errgroup.Group{}
+	group, ctx := errgroup.WithContext(ctx)
 	group.Go(func() error {
 		return startWebhook(ctx, namespace, g.Listen, mgr.GetClient(), mgr.GetCache())
 	})
 	group.Go(func() error {
 		setupLog.Info("starting manager")
+
 		if err = reconciler.SetupWithManager(mgr); err != nil {
 			return err
 		}