diff --git a/internal/bootstrap/handlers/clients.go b/internal/bootstrap/handlers/clients.go
index a7b2b5b4c..59dd4e4a7 100644
--- a/internal/bootstrap/handlers/clients.go
+++ b/internal/bootstrap/handlers/clients.go
@@ -81,7 +81,7 @@ func (_ *Clients) BootstrapHandler(
 	if _, ok := config.Clients[common.CoreDataClientName]; ok {
 		eventClient = coredata.NewEventClient(
 			urlclient.New(
-				context.Background(),
+				ctx,
 				wg,
 				registryClient,
 				clients.CoreDataServiceKey,
@@ -93,7 +93,7 @@ func (_ *Clients) BootstrapHandler(
 
 		valueDescriptorClient = coredata.NewValueDescriptorClient(
 			urlclient.New(
-				context.Background(),
+				ctx,
 				wg,
 				registryClient,
 				clients.CoreDataServiceKey,
@@ -107,7 +107,7 @@ func (_ *Clients) BootstrapHandler(
 	if _, ok := config.Clients[common.CoreCommandClientName]; ok {
 		commandClient = command.NewCommandClient(
 			urlclient.New(
-				context.Background(),
+				ctx,
 				wg,
 				registryClient,
 				clients.CoreCommandServiceKey,
@@ -121,7 +121,7 @@ func (_ *Clients) BootstrapHandler(
 	if _, ok := config.Clients[common.NotificationsClientName]; ok {
 		notificationsClient = notifications.NewNotificationsClient(
 			urlclient.New(
-				context.Background(),
+				ctx,
 				wg,
 				registryClient,
 				clients.SupportNotificationsServiceKey,