diff --git a/cmd/hatchet-cli/cli/trigger.go b/cmd/hatchet-cli/cli/trigger.go
index 9a52be62ff..eae9879fe5 100644
--- a/cmd/hatchet-cli/cli/trigger.go
+++ b/cmd/hatchet-cli/cli/trigger.go
@@ -620,8 +620,12 @@ func triggerWorkflowWithClient(hatchetClient client.Client, workflowName string,
 	}
 	resultChan := make(chan result, 1)
 
+	// Wait for result with timeout
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
 	go func() {
-		workflow, err := hatchetClient.Admin().RunWorkflow(workflowName, inputData)
+		workflow, err := hatchetClient.Admin().RunWorkflow(ctx, workflowName, inputData)
 		if err != nil {
 			resultChan <- result{err: fmt.Errorf("could not trigger workflow: %w", err)}
 			return
@@ -629,10 +633,6 @@ func triggerWorkflowWithClient(hatchetClient client.Client, workflowName string,
 		resultChan <- result{runID: workflow.RunId()}
 	}()
 
-	// Wait for result with timeout
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
 	select {
 	case res := <-resultChan:
 		if res.err != nil {
diff --git a/pkg/client/admin.go b/pkg/client/admin.go
index 17555f841e..4719d5f4d9 100644
--- a/pkg/client/admin.go
+++ b/pkg/client/admin.go
@@ -77,22 +77,22 @@ type RunDetails struct {
 type AdminClient interface {
 	// Deprecated: PutWorkflow is part of the legacy v0 workflow definition system.
 	// Use the new Go SDK at github.com/hatchet-dev/hatchet/sdks/go instead. Migration guide: https://docs.hatchet.run/home/migration-guide-go
-	PutWorkflow(workflow *types.Workflow, opts ...PutOptFunc) error
+	PutWorkflow(ctx context.Context, workflow *types.Workflow, opts ...PutOptFunc) error //nolint:staticcheck // SA1019: Retained for backwards compatability
 	// Deprecated: PutWorkflowV1 is an internal method used by the new Go SDK.
 	// Use the new Go SDK at github.com/hatchet-dev/hatchet/sdks/go instead of calling this directly. Migration guide: https://docs.hatchet.run/home/migration-guide-go
-	PutWorkflowV1(workflow *v1contracts.CreateWorkflowVersionRequest, opts ...PutOptFunc) error
+	PutWorkflowV1(ctx context.Context, workflow *v1contracts.CreateWorkflowVersionRequest, opts ...PutOptFunc) error
 
-	ScheduleWorkflow(workflowName string, opts ...ScheduleOptFunc) error
+	ScheduleWorkflow(ctx context.Context, workflowName string, opts ...ScheduleOptFunc) error
 
 	// RunWorkflow triggers a workflow run and returns the run id
-	RunWorkflow(workflowName string, input interface{}, opts ...RunOptFunc) (*Workflow, error)
+	RunWorkflow(ctx context.Context, workflowName string, input interface{}, opts ...RunOptFunc) (*Workflow, error)
 
-	BulkRunWorkflow(workflows []*WorkflowRun) ([]string, error)
+	BulkRunWorkflow(ctx context.Context, workflows []*WorkflowRun) ([]string, error)
 
-	RunChildWorkflow(workflowName string, input interface{}, opts *ChildWorkflowOpts) (string, error)
-	RunChildWorkflows(workflows []*RunChildWorkflowsOpts) ([]string, error)
+	RunChildWorkflow(ctx context.Context, workflowName string, input interface{}, opts *ChildWorkflowOpts) (string, error)
+	RunChildWorkflows(ctx context.Context, workflows []*RunChildWorkflowsOpts) ([]string, error)
 
-	PutRateLimit(key string, opts *types.RateLimitOpts) error
+	PutRateLimit(ctx context.Context, key string, opts *types.RateLimitOpts) error
 
 	GetRunDetails(ctx context.Context, externalId uuid.UUID) (*RunDetails, error)
 }
@@ -149,7 +149,7 @@ func defaultPutOpts() *putOpts {
 
 // Deprecated: PutWorkflow is part of the legacy v0 workflow definition system.
 // Use the new Go SDK at github.com/hatchet-dev/hatchet/sdks/go instead. Migration guide: https://docs.hatchet.run/home/migration-guide-go
-func (a *adminClientImpl) PutWorkflow(workflow *types.Workflow, fs ...PutOptFunc) error {
+func (a *adminClientImpl) PutWorkflow(ctx context.Context, workflow *types.Workflow, fs ...PutOptFunc) error {
 	opts := defaultPutOpts()
 
 	for _, f := range fs {
@@ -162,7 +162,7 @@ func (a *adminClientImpl) PutWorkflow(workflow *types.Workflow, fs ...PutOptFunc
 		return fmt.Errorf("could not get put opts: %w", err)
 	}
 
-	_, err = a.client.PutWorkflow(a.ctx.newContext(context.Background()), req)
+	_, err = a.client.PutWorkflow(a.ctx.newContext(ctx), req)
 
 	if err != nil {
 		return fmt.Errorf("could not create workflow %s: %w", workflow.Name, err)
@@ -173,14 +173,14 @@ func (a *adminClientImpl) PutWorkflow(workflow *types.Workflow, fs ...PutOptFunc
 
 // Deprecated: PutWorkflowV1 is an internal method used by the new Go SDK.
 // Use the new Go SDK at github.com/hatchet-dev/hatchet/sdks/go instead of calling this directly. Migration guide: https://docs.hatchet.run/home/migration-guide-go
-func (a *adminClientImpl) PutWorkflowV1(workflow *v1contracts.CreateWorkflowVersionRequest, fs ...PutOptFunc) error {
+func (a *adminClientImpl) PutWorkflowV1(ctx context.Context, workflow *v1contracts.CreateWorkflowVersionRequest, fs ...PutOptFunc) error {
 	opts := defaultPutOpts()
 
 	for _, f := range fs {
 		f(opts)
 	}
 
-	_, err := a.v1Client.PutWorkflow(a.ctx.newContext(context.Background()), workflow)
+	_, err := a.v1Client.PutWorkflow(a.ctx.newContext(ctx), workflow)
 
 	if err != nil {
 		return fmt.Errorf("could not create workflow %s: %w", workflow.Name, err)
@@ -213,7 +213,7 @@ func defaultScheduleOpts() *scheduleOpts {
 	return &scheduleOpts{}
 }
 
-func (a *adminClientImpl) ScheduleWorkflow(workflowName string, fs ...ScheduleOptFunc) error {
+func (a *adminClientImpl) ScheduleWorkflow(ctx context.Context, workflowName string, fs ...ScheduleOptFunc) error {
 	opts := defaultScheduleOpts()
 
 	for _, f := range fs {
@@ -238,7 +238,7 @@ func (a *adminClientImpl) ScheduleWorkflow(workflowName string, fs ...ScheduleOp
 
 	workflowName = client.ApplyNamespace(workflowName, &a.namespace)
 
-	_, err = a.client.ScheduleWorkflow(a.ctx.newContext(context.Background()), &admincontracts.ScheduleWorkflowRequest{
+	_, err = a.client.ScheduleWorkflow(a.ctx.newContext(ctx), &admincontracts.ScheduleWorkflowRequest{
 		Name:      workflowName,
 		Schedules: pbSchedules,
 		Input:     string(inputBytes),
@@ -327,7 +327,7 @@ func desiredWorkerLabelsToProto(labels map[string]*types.DesiredWorkerLabel) map
 // 	}
 // }
 
-func (a *adminClientImpl) RunWorkflow(workflowName string, input interface{}, options ...RunOptFunc) (*Workflow, error) {
+func (a *adminClientImpl) RunWorkflow(ctx context.Context, workflowName string, input interface{}, options ...RunOptFunc) (*Workflow, error) {
 	inputBytes, err := json.Marshal(input)
 
 	if err != nil {
@@ -348,7 +348,7 @@ func (a *adminClientImpl) RunWorkflow(workflowName string, input interface{}, op
 		}
 	}
 
-	res, err := a.client.TriggerWorkflow(a.ctx.newContext(context.Background()), request)
+	res, err := a.client.TriggerWorkflow(a.ctx.newContext(ctx), request)
 
 	if err != nil {
 		if status.Code(err) == codes.AlreadyExists {
@@ -372,7 +372,7 @@ func (a *adminClientImpl) RunWorkflow(workflowName string, input interface{}, op
 	}, nil
 }
 
-func (a *adminClientImpl) BulkRunWorkflow(workflows []*WorkflowRun) ([]string, error) {
+func (a *adminClientImpl) BulkRunWorkflow(ctx context.Context, workflows []*WorkflowRun) ([]string, error) {
 
 	triggerWorkflowRequests := make([]*v1contracts.TriggerWorkflowRequest, len(workflows))
 
@@ -400,7 +400,7 @@ func (a *adminClientImpl) BulkRunWorkflow(workflows []*WorkflowRun) ([]string, e
 		Workflows: triggerWorkflowRequests,
 	}
 
-	res, err := a.client.BulkTriggerWorkflow(a.ctx.newContext(context.Background()), &r)
+	res, err := a.client.BulkTriggerWorkflow(a.ctx.newContext(ctx), &r)
 
 	if err != nil {
 		return nil, fmt.Errorf("could not bulk trigger workflows: %w", err)
@@ -410,7 +410,7 @@ func (a *adminClientImpl) BulkRunWorkflow(workflows []*WorkflowRun) ([]string, e
 
 }
 
-func (a *adminClientImpl) RunChildWorkflow(workflowName string, input interface{}, opts *ChildWorkflowOpts) (string, error) {
+func (a *adminClientImpl) RunChildWorkflow(ctx context.Context, workflowName string, input interface{}, opts *ChildWorkflowOpts) (string, error) {
 	inputBytes, err := json.Marshal(input)
 
 	if err != nil {
@@ -429,7 +429,7 @@ func (a *adminClientImpl) RunChildWorkflow(workflowName string, input interface{
 
 	metadata := string(metadataBytes)
 
-	res, err := a.client.TriggerWorkflow(a.ctx.newContext(context.Background()), &v1contracts.TriggerWorkflowRequest{
+	res, err := a.client.TriggerWorkflow(a.ctx.newContext(ctx), &admincontracts.TriggerWorkflowRequest{
 		Name:                    workflowName,
 		Input:                   string(inputBytes),
 		ParentId:                &opts.ParentId,
@@ -462,7 +462,7 @@ type RunChildWorkflowsOpts struct {
 	Opts         *ChildWorkflowOpts
 }
 
-func (a *adminClientImpl) RunChildWorkflows(workflows []*RunChildWorkflowsOpts) ([]string, error) {
+func (a *adminClientImpl) RunChildWorkflows(ctx context.Context, workflows []*RunChildWorkflowsOpts) ([]string, error) {
 
 	triggerWorkflowRequests := make([]*v1contracts.TriggerWorkflowRequest, len(workflows))
 
@@ -507,7 +507,7 @@ func (a *adminClientImpl) RunChildWorkflows(workflows []*RunChildWorkflowsOpts)
 
 	}
 
-	res, err := a.client.BulkTriggerWorkflow(a.ctx.newContext(context.Background()), &admincontracts.BulkTriggerWorkflowRequest{
+	res, err := a.client.BulkTriggerWorkflow(a.ctx.newContext(ctx), &admincontracts.BulkTriggerWorkflowRequest{
 		Workflows: triggerWorkflowRequests,
 	})
 
@@ -519,7 +519,7 @@ func (a *adminClientImpl) RunChildWorkflows(workflows []*RunChildWorkflowsOpts)
 	return res.WorkflowRunIds, nil
 }
 
-func (a *adminClientImpl) PutRateLimit(key string, opts *types.RateLimitOpts) error {
+func (a *adminClientImpl) PutRateLimit(ctx context.Context, key string, opts *types.RateLimitOpts) error {
 	if err := a.v.Validate(opts); err != nil {
 		return fmt.Errorf("could not validate rate limit opts: %w", err)
 	}
@@ -540,7 +540,7 @@ func (a *adminClientImpl) PutRateLimit(key string, opts *types.RateLimitOpts) er
 		putParams.Duration = admincontracts.RateLimitDuration_SECOND
 	}
 
-	_, err := a.client.PutRateLimit(a.ctx.newContext(context.Background()), putParams)
+	_, err := a.client.PutRateLimit(a.ctx.newContext(ctx), putParams)
 
 	if err != nil {
 		return fmt.Errorf("could not upsert rate limit: %w", err)
@@ -806,21 +806,21 @@ func (a *adminClientImpl) getAdditionalMetaBytes(opt *map[string]string) ([]byte
 	return metadataBytes, nil
 }
 
-func (h *adminClientImpl) saveOrLoadListener() (*WorkflowRunsListener, error) {
-	h.listenerMu.Lock()
-	defer h.listenerMu.Unlock()
+func (a *adminClientImpl) saveOrLoadListener() (*WorkflowRunsListener, error) {
+	a.listenerMu.Lock()
+	defer a.listenerMu.Unlock()
 
-	if h.listener != nil {
-		return h.listener, nil
+	if a.listener != nil {
+		return a.listener, nil
 	}
 
-	listener, err := h.subscriber.SubscribeToWorkflowRunEvents(context.Background())
+	listener, err := a.subscriber.SubscribeToWorkflowRunEvents(context.Background())
 
 	if err != nil {
 		return nil, fmt.Errorf("failed to subscribe to workflow run events: %w", err)
 	}
 
-	h.listener = listener
+	a.listener = listener
 
 	return listener, nil
 }
diff --git a/pkg/client/client.go b/pkg/client/client.go
index cd346fc5c5..ae5f53b723 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -396,7 +396,7 @@ func newFromOpts(opts *ClientOpts) (Client, error) {
 
 	// if init workflows is set, then we need to initialize the workflows
 	if opts.initWorkflows {
-		if err := initWorkflows(opts.filesLoader, admin); err != nil {
+		if err := initWorkflows(context.TODO(), opts.filesLoader, admin); err != nil {
 			return nil, fmt.Errorf("could not init workflows: %w", err)
 		}
 	}
@@ -472,11 +472,11 @@ func (c *clientImpl) RunnableActions() []string {
 	return c.runnableActions
 }
 
-func initWorkflows(fl filesLoaderFunc, adminClient AdminClient) error {
+func initWorkflows(ctx context.Context, fl filesLoaderFunc, adminClient AdminClient) error {
 	files := fl()
 
 	for _, file := range files {
-		if err := adminClient.PutWorkflow(file); err != nil {
+		if err := adminClient.PutWorkflow(ctx, file); err != nil {
 			return fmt.Errorf("could not create workflow: %w", err)
 		}
 	}
diff --git a/pkg/v1/features/ratelimits.go b/pkg/v1/features/ratelimits.go
index 1cb9299c11..cc90be15fe 100644
--- a/pkg/v1/features/ratelimits.go
+++ b/pkg/v1/features/ratelimits.go
@@ -57,7 +57,7 @@ func NewRateLimitsClient(
 //
 // Upsert creates or updates a rate limit with the provided options.
 func (c *rlClientImpl) Upsert(opts CreateRatelimitOpts) error {
-	return (*c.admin).PutRateLimit(opts.Key, &types.RateLimitOpts{
+	return (*c.admin).PutRateLimit(context.Background(), opts.Key, &types.RateLimitOpts{
 		Max:      opts.Limit,
 		Duration: opts.Duration,
 	})
diff --git a/pkg/v1/workflow/declaration.go b/pkg/v1/workflow/declaration.go
index af4980a84a..e8acec3847 100644
--- a/pkg/v1/workflow/declaration.go
+++ b/pkg/v1/workflow/declaration.go
@@ -539,7 +539,7 @@ func (w *workflowDeclarationImpl[I, O]) RunBulkNoWait(ctx context.Context, input
 		}
 	}
 
-	run, err := w.v0.Admin().BulkRunWorkflow(toRun)
+	run, err := w.v0.Admin().BulkRunWorkflow(ctx, toRun)
 	if err != nil {
 		return nil, err
 	}
@@ -553,7 +553,7 @@ func (w *workflowDeclarationImpl[I, O]) RunBulkNoWait(ctx context.Context, input
 // RunNoWait executes the workflow with the provided input without waiting for it to complete.
 // Instead it returns a run ID that can be used to check the status of the workflow.
 func (w *workflowDeclarationImpl[I, O]) RunNoWait(ctx context.Context, input I, opts ...v0Client.RunOptFunc) (*v0Client.Workflow, error) {
-	run, err := w.v0.Admin().RunWorkflow(w.Name, input, opts...)
+	run, err := w.v0.Admin().RunWorkflow(ctx, w.Name, input, opts...)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/worker/context.go b/pkg/worker/context.go
index 3c9eec5925..b60f40172e 100644
--- a/pkg/worker/context.go
+++ b/pkg/worker/context.go
@@ -514,6 +514,7 @@ func (h *hatchetContext) SpawnWorkflow(workflowName string, input any, opts *Spa
 	h.indexMu.Unlock()
 
 	workflowRunId, err := h.client().Admin().RunChildWorkflow(
+		h,
 		workflowName,
 		input,
 		&client.ChildWorkflowOpts{
@@ -595,6 +596,7 @@ func (h *hatchetContext) SpawnWorkflows(childWorkflows []*SpawnWorkflowsOpts) ([
 	}
 
 	workflowRunIds, err := h.client().Admin().RunChildWorkflows(
+		h,
 		triggerWorkflows,
 	)
 
diff --git a/pkg/worker/service.go b/pkg/worker/service.go
index eb6fdb830b..67f6d1afe5 100644
--- a/pkg/worker/service.go
+++ b/pkg/worker/service.go
@@ -1,6 +1,7 @@
 package worker
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/hatchet-dev/hatchet/pkg/client/compute"
@@ -43,7 +44,7 @@ func (s *Service) On(t triggerConverter, workflow workflowConverter) error {
 	apiWorkflow.Triggers = *wt
 
 	// create the workflow via the API
-	err := s.worker.client.Admin().PutWorkflow(&apiWorkflow)
+	err := s.worker.client.Admin().PutWorkflow(context.TODO(), &apiWorkflow)
 
 	if err != nil {
 		return err
diff --git a/pkg/worker/worker.go b/pkg/worker/worker.go
index 865223afeb..426d00338f 100644
--- a/pkg/worker/worker.go
+++ b/pkg/worker/worker.go
@@ -433,7 +433,7 @@ func (w *Worker) RegisterWorkflowV1(workflow *contracts.CreateWorkflowVersionReq
 
 	w.registered_workflows[namespaced] = true
 
-	return w.client.Admin().PutWorkflowV1(workflow)
+	return w.client.Admin().PutWorkflowV1(context.TODO(), workflow)
 }
 
 // Deprecated: On is part of the legacy v0 workflow definition system.
diff --git a/sdks/go/client.go b/sdks/go/client.go
index 10827c00ac..3cb966b0ac 100644
--- a/sdks/go/client.go
+++ b/sdks/go/client.go
@@ -640,7 +640,7 @@ func (c *Client) RunNoWait(ctx context.Context, workflowName string, input any,
 			AdditionalMetadata: additionalMetadata,
 		})
 	} else {
-		v0Workflow, err = c.legacyClient.Admin().RunWorkflow(workflowName, input, v0Opts...)
+		v0Workflow, err = c.legacyClient.Admin().RunWorkflow(ctx, workflowName, input, v0Opts...)
 	}
 
 	if err != nil {
diff --git a/sdks/go/features/ratelimits.go b/sdks/go/features/ratelimits.go
index 42cf77de9d..1a82e02f5c 100644
--- a/sdks/go/features/ratelimits.go
+++ b/sdks/go/features/ratelimits.go
@@ -46,7 +46,7 @@ func NewRateLimitsClient(
 
 // Upsert creates or updates a rate limit with the provided options.
 func (c *RateLimitsClient) Upsert(opts CreateRatelimitOpts) error {
-	if err := c.admin.PutRateLimit(opts.Key, &types.RateLimitOpts{
+	if err := c.admin.PutRateLimit(context.TODO(), opts.Key, &types.RateLimitOpts{
 		Max:      opts.Limit,
 		Duration: opts.Duration,
 	}); err != nil {
diff --git a/sdks/go/workflow.go b/sdks/go/workflow.go
index 03a8ffe023..a1d6610f3f 100644
--- a/sdks/go/workflow.go
+++ b/sdks/go/workflow.go
@@ -631,7 +631,7 @@ func (w *Workflow) RunNoWait(ctx context.Context, input any, opts ...RunOptFunc)
 			DesiredWorkerLabels: runOpts.DesiredWorkerLabels,
 		})
 	} else {
-		v0Workflow, err = w.v0Client.Admin().RunWorkflow(w.declaration.Name(), input, v0Opts...)
+		v0Workflow, err = w.v0Client.Admin().RunWorkflow(ctx, w.declaration.Name(), input, v0Opts...)
 	}
 
 	if err != nil {