diff --git a/.github/workflows/test-dapr-bot.yml b/.github/workflows/test-dapr-bot.yml
index 67b3d31..de1a427 100644
--- a/.github/workflows/test-dapr-bot.yml
+++ b/.github/workflows/test-dapr-bot.yml
@@ -17,7 +17,7 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     env:
-      GOLANGCILINT_VER: v1.61.0
+      GOLANGCILINT_VER: v1.64.6
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/test-on-push.yaml b/.github/workflows/test-on-push.yaml
index 7c1f34b..617ece2 100644
--- a/.github/workflows/test-on-push.yaml
+++ b/.github/workflows/test-on-push.yaml
@@ -11,7 +11,7 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     env:
-      GOLANGCILINT_VER: v1.61.0
+      GOLANGCILINT_VER: v1.64.6
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/test-tooling.yml b/.github/workflows/test-tooling.yml
index 5a647a2..08fa227 100644
--- a/.github/workflows/test-tooling.yml
+++ b/.github/workflows/test-tooling.yml
@@ -25,7 +25,7 @@ jobs:
           - "macos-latest"
     runs-on: ${{ matrix.os }}
     env:
-      GOLANGCILINT_VER: v1.61.0 # Make sure to bump /tools/check-lint-version/main_test.go
+      GOLANGCILINT_VER: v1.64.6 # Make sure to bump /tools/check-lint-version/main_test.go
 
     steps:
       - name: Checkout
diff --git a/.golangci.yml b/.golangci.yml
index b344e19..7a8cf71 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -234,7 +234,6 @@ linters:
     - lll
     - unparam
     - wsl
-    - gomnd
     - testpackage
     - nestif
     - nlreturn
@@ -271,8 +270,6 @@ linters:
     - tagalign
     - mnd
     - canonicalheader
-    - exportloopref
-    - execinquery
     - err113
     - fatcontext
     - forbidigo # TODO: Re-enable and remove fmt.println
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 2be3266..5c1ee97 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,10 @@ cover: ## Displays test coverage in the client and service packages
 lint: check-lint ## Lints the entire project
 	golangci-lint run --timeout=3m
 
+.PHONY: lint-fix
+lint-fix: check-lint ## Lints the entire project
+	golangci-lint run --timeout=3m --fix
+
 .PHONY: check-lint
 check-lint: ## Compares the locally installed linter with the workflow version
 	cd ./tools/check-lint-version && \
diff --git a/actor/runtime/actor_runtime_test.go b/actor/runtime/actor_runtime_test.go
index 74bfe9c..b245a31 100644
--- a/actor/runtime/actor_runtime_test.go
+++ b/actor/runtime/actor_runtime_test.go
@@ -48,6 +48,7 @@ func TestRegisterActorFactoryAndInvokeMethod(t *testing.T) {
 	mockServer.EXPECT().RegisterActorImplFactory(gomock.Any())
 	rt.RegisterActorFactory(actorMock.ActorImplFactory)
 
+	//nolint:usetesting
 	mockServer.EXPECT().InvokeMethod(context.Background(), "mockActorID", "Invoke", []byte("param")).Return([]byte("response"), actorErr.Success)
 	rspData, err := rt.InvokeActorMethod("testActorType", "mockActorID", "Invoke", []byte("param"))
 
@@ -89,6 +90,7 @@ func TestInvokeReminder(t *testing.T) {
 	mockServer.EXPECT().RegisterActorImplFactory(gomock.Any())
 	rt.RegisterActorFactory(actorMock.ActorImplFactory)
 
+	//nolint:usetesting
 	mockServer.EXPECT().InvokeReminder(context.Background(), "mockActorID", "mockReminder", []byte("param")).Return(actorErr.Success)
 	err = rt.InvokeReminder("testActorType", "mockActorID", "mockReminder", []byte("param"))
 
@@ -109,6 +111,7 @@ func TestInvokeTimer(t *testing.T) {
 	mockServer.EXPECT().RegisterActorImplFactory(gomock.Any())
 	rt.RegisterActorFactory(actorMock.ActorImplFactory)
 
+	//nolint:usetesting
 	mockServer.EXPECT().InvokeTimer(context.Background(), "mockActorID", "mockTimer", []byte("param")).Return(actorErr.Success)
 	err = rt.InvokeTimer("testActorType", "mockActorID", "mockTimer", []byte("param"))
 
diff --git a/client/actor_test.go b/client/actor_test.go
index a5cf468..014781e 100644
--- a/client/actor_test.go
+++ b/client/actor_test.go
@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -25,7 +24,7 @@ import (
 const testActorType = "test"
 
 func TestInvokeActor(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &InvokeActorRequest{
 		ActorID:   "fn",
 		Method:    "mockMethod",
@@ -74,7 +73,7 @@ func TestInvokeActor(t *testing.T) {
 }
 
 func TestRegisterActorReminder(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &RegisterActorReminderRequest{
 		ActorID:   "fn",
 		Data:      []byte(`{hello}`),
@@ -137,7 +136,7 @@ func TestRegisterActorReminder(t *testing.T) {
 }
 
 func TestRegisterActorTimer(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &RegisterActorTimerRequest{
 		ActorID:   "fn",
 		Data:      []byte(`{hello}`),
@@ -215,7 +214,7 @@ func TestRegisterActorTimer(t *testing.T) {
 }
 
 func TestUnregisterActorReminder(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &UnregisterActorReminderRequest{
 		ActorID:   "fn",
 		ActorType: testActorType,
@@ -260,7 +259,7 @@ func TestUnregisterActorReminder(t *testing.T) {
 }
 
 func TestUnregisterActorTimer(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &UnregisterActorTimerRequest{
 		ActorID:   "fn",
 		ActorType: testActorType,
diff --git a/client/binding_test.go b/client/binding_test.go
index aaeffbc..c7c8e9a 100644
--- a/client/binding_test.go
+++ b/client/binding_test.go
@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -25,7 +24,7 @@ import (
 // go test -timeout 30s ./client -count 1 -run ^TestInvokeBinding$
 
 func TestInvokeBinding(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	in := &InvokeBindingRequest{
 		Name:      "test",
 		Operation: "fn",
diff --git a/client/client_test.go b/client/client_test.go
index 9b8e969..9b41e50 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -98,7 +98,7 @@ func TestNewClient(t *testing.T) {
 	})
 
 	t.Run("new client with trace ID", func(t *testing.T) {
-		_ = testClient.WithTraceID(context.Background(), "test")
+		_ = testClient.WithTraceID(t.Context(), "test")
 	})
 
 	t.Run("new socket client closed with token", func(t *testing.T) {
@@ -120,13 +120,13 @@ func TestNewClient(t *testing.T) {
 		c, err := NewClientWithSocket(testSocket)
 		require.NoError(t, err)
 		defer c.Close()
-		ctx := c.WithTraceID(context.Background(), "")
+		ctx := c.WithTraceID(t.Context(), "")
 		_ = c.WithTraceID(ctx, "test")
 	})
 }
 
 func TestShutdown(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("shutdown", func(t *testing.T) {
 		err := testClient.Shutdown(ctx)
diff --git a/client/configuration_test.go b/client/configuration_test.go
index b90e193..ee6459e 100644
--- a/client/configuration_test.go
+++ b/client/configuration_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -16,7 +15,7 @@ const (
 )
 
 func TestGetConfigurationItem(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("get configuration item", func(t *testing.T) {
 		resp, err := testClient.GetConfigurationItem(ctx, "example-config", "mykey")
@@ -31,7 +30,7 @@ func TestGetConfigurationItem(t *testing.T) {
 }
 
 func TestGetConfigurationItems(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	keys := []string{"mykey1", "mykey2", "mykey3"}
 	t.Run("Test get configuration items", func(t *testing.T) {
@@ -44,7 +43,7 @@ func TestGetConfigurationItems(t *testing.T) {
 }
 
 func TestSubscribeConfigurationItems(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	var counter, totalCounter uint32
 	counter = 0
@@ -67,7 +66,7 @@ func TestSubscribeConfigurationItems(t *testing.T) {
 }
 
 func TestUnSubscribeConfigurationItems(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	var counter, totalCounter uint32
 	t.Run("Test unsubscribe configuration items", func(t *testing.T) {
diff --git a/client/crypto_test.go b/client/crypto_test.go
index 46956f3..b823faa 100644
--- a/client/crypto_test.go
+++ b/client/crypto_test.go
@@ -30,7 +30,7 @@ import (
 )
 
 func TestEncrypt(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("missing ComponentName", func(t *testing.T) {
 		out, err := testClient.Encrypt(ctx,
@@ -138,7 +138,7 @@ func TestEncrypt(t *testing.T) {
 }
 
 func TestDecrypt(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("missing ComponentName", func(t *testing.T) {
 		out, err := testClient.Decrypt(ctx,
diff --git a/client/invoke_test.go b/client/invoke_test.go
index 3a8b769..8438c08 100644
--- a/client/invoke_test.go
+++ b/client/invoke_test.go
@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -39,7 +38,7 @@ type _testStructwithSlices struct {
 }
 
 func TestInvokeMethodWithContent(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	data := "ping"
 
 	t.Run("with content", func(t *testing.T) {
diff --git a/client/lock_test.go b/client/lock_test.go
index 86d0acd..75ae1c8 100644
--- a/client/lock_test.go
+++ b/client/lock_test.go
@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -29,7 +28,7 @@ const (
 )
 
 func TestLock(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("try lock invalid store name", func(t *testing.T) {
 		r, err := testClient.TryLockAlpha1(ctx, "", &LockRequest{})
diff --git a/client/metadata_test.go b/client/metadata_test.go
index fa34e6f..b36107f 100644
--- a/client/metadata_test.go
+++ b/client/metadata_test.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -11,7 +10,7 @@ import (
 
 // Test GetMetadata returns
 func TestGetMetadata(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	t.Run("get meta", func(t *testing.T) {
 		metadata, err := testClient.GetMetadata(ctx)
 		require.NoError(t, err)
@@ -20,7 +19,7 @@ func TestGetMetadata(t *testing.T) {
 }
 
 func TestSetMetadata(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	t.Run("set meta", func(t *testing.T) {
 		err := testClient.SetMetadata(ctx, "test_key", "test_value")
 		require.NoError(t, err)
diff --git a/client/pubsub_test.go b/client/pubsub_test.go
index 56db135..ed93f97 100644
--- a/client/pubsub_test.go
+++ b/client/pubsub_test.go
@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -39,7 +38,7 @@ type _testCustomContentwithSlices struct {
 
 // go test -timeout 30s ./client -count 1 -run ^TestPublishEvent$
 func TestPublishEvent(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("with data", func(t *testing.T) {
 		err := testClient.PublishEvent(ctx, "messages", "test", []byte("ping"))
@@ -96,7 +95,7 @@ func TestPublishEvent(t *testing.T) {
 
 // go test -timeout 30s ./client -count 1 -run ^TestPublishEvents$
 func TestPublishEvents(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("without pubsub name", func(t *testing.T) {
 		res := testClient.PublishEvents(ctx, "", "test", []interface{}{"ping", "pong"})
diff --git a/client/scheduling_test.go b/client/scheduling_test.go
index 43f8ec6..8d0c5e4 100644
--- a/client/scheduling_test.go
+++ b/client/scheduling_test.go
@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -23,7 +22,7 @@ import (
 )
 
 func TestSchedulingAlpha1(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("schedule job - valid", func(t *testing.T) {
 		err := testClient.ScheduleJobAlpha1(ctx, &Job{
diff --git a/client/secret_test.go b/client/secret_test.go
index 94047f9..9b63ce3 100644
--- a/client/secret_test.go
+++ b/client/secret_test.go
@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -24,7 +23,7 @@ import (
 
 // go test -timeout 30s ./client -count 1 -run ^TestGetSecret$
 func TestGetSecret(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("without store", func(t *testing.T) {
 		out, err := testClient.GetSecret(ctx, "", "key1", nil)
@@ -53,7 +52,7 @@ func TestGetSecret(t *testing.T) {
 }
 
 func TestGetBulkSecret(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	t.Run("without store", func(t *testing.T) {
 		out, err := testClient.GetBulkSecret(ctx, "", nil)
diff --git a/client/state_test.go b/client/state_test.go
index 5dd83fd..62ee052 100644
--- a/client/state_test.go
+++ b/client/state_test.go
@@ -14,7 +14,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"testing"
 	"time"
 
@@ -77,7 +76,7 @@ func TestStateOptionsConverter(t *testing.T) {
 
 // go test -timeout 30s ./client -count 1 -run ^TestSaveState$
 func TestSaveState(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	data := testData
 	store := testStore
 	key := "key1"
@@ -118,7 +117,7 @@ func TestSaveState(t *testing.T) {
 
 // go test -timeout 30s ./client -count 1 -run ^TestDeleteState$
 func TestDeleteState(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	data := testData
 	store := testStore
 	key := "key1"
@@ -189,7 +188,7 @@ func TestDeleteState(t *testing.T) {
 }
 
 func TestDeleteBulkState(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	data := testData
 	store := testStore
 	keys := []string{"key1", "key2", "key3"}
@@ -337,7 +336,7 @@ func TestDeleteBulkState(t *testing.T) {
 
 // go test -timeout 30s ./client -count 1 -run ^TestStateTransactions$
 func TestStateTransactions(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	data := `{ "message": "test" }`
 	store := testStore
 	meta := map[string]string{}
@@ -410,7 +409,7 @@ func TestStateTransactions(t *testing.T) {
 }
 
 func TestQueryState(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	data := testData
 	store := testStore
 	key1 := "key1"
diff --git a/client/wait_test.go b/client/wait_test.go
index eeabe35..70b4825 100644
--- a/client/wait_test.go
+++ b/client/wait_test.go
@@ -116,14 +116,14 @@ func createNonBlockingClient(ctx context.Context, serverAddr string) (client Cli
 }
 
 func TestGrpcWaitHappyCase(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	err := testClient.Wait(ctx, waitTimeout)
 	require.NoError(t, err)
 }
 
 func TestGrpcWaitUnresponsiveTcpServer(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	server, err := createUnresponsiveTCPServer()
 	require.NoError(t, err)
@@ -141,7 +141,7 @@ func TestGrpcWaitUnresponsiveTcpServer(t *testing.T) {
 }
 
 func TestGrpcWaitUnresponsiveUnixServer(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	server, err := createUnresponsiveUnixServer()
 	require.NoError(t, err)
diff --git a/client/workflow_test.go b/client/workflow_test.go
index 3beee0e..a6f52dd 100644
--- a/client/workflow_test.go
+++ b/client/workflow_test.go
@@ -15,7 +15,6 @@ limitations under the License.
 package client
 
 import (
-	"context"
 	"math"
 	"testing"
 
@@ -35,7 +34,7 @@ func TestMarshalInput(t *testing.T) {
 }
 
 func TestWorkflowBeta1(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	// 1: StartWorkflow
 	t.Run("start workflow - valid (without id)", func(t *testing.T) {
diff --git a/examples/go.mod b/examples/go.mod
index 29ec1ea..954aaec 100644
--- a/examples/go.mod
+++ b/examples/go.mod
@@ -1,6 +1,6 @@
 module github.com/dapr/go-sdk/examples
 
-go 1.23.6
+go 1.24.2
 
 replace github.com/dapr/go-sdk => ../
 
@@ -9,18 +9,18 @@ require (
 	github.com/dapr/go-sdk v0.0.0-00010101000000-000000000000
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/google/uuid v1.6.0
-	google.golang.org/grpc v1.70.0
+	google.golang.org/grpc v1.72.0
 	google.golang.org/grpc/examples v0.0.0-20240516203910-e22436abb809
-	google.golang.org/protobuf v1.36.4
+	google.golang.org/protobuf v1.36.6
 )
 
 require (
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/dapr/dapr v1.15.0-rc.17 // indirect
-	github.com/dapr/durabletask-go v0.6.3 // indirect
-	github.com/dapr/kit v0.15.0 // indirect
+	github.com/dapr/dapr v1.15.5 // indirect
+	github.com/dapr/durabletask-go v0.6.5 // indirect
+	github.com/dapr/kit v0.15.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/go-chi/chi/v5 v5.1.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
@@ -28,13 +28,13 @@ require (
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel v1.34.0 // indirect
-	go.opentelemetry.io/otel/metric v1.34.0 // indirect
-	go.opentelemetry.io/otel/trace v1.34.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
+	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
 )
diff --git a/examples/go.sum b/examples/go.sum
index 39285c3..f20d84b 100644
--- a/examples/go.sum
+++ b/examples/go.sum
@@ -6,20 +6,20 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/dapr/dapr v1.15.0-rc.17 h1:bR0rd4FH81IteuOHTWVNyl58ZuQTDp3DYaTtXnpZ6JA=
-github.com/dapr/dapr v1.15.0-rc.17/go.mod h1:SD0AXom2XpX7pr8eYlbJ+gHfNREsflsrzCR19AZJ7/Q=
-github.com/dapr/durabletask-go v0.6.3 h1:WHhSAw1YL4xneK3Jo5nGfmMaJxfFodIIF5q1rpkDDfs=
-github.com/dapr/durabletask-go v0.6.3/go.mod h1:nTZ5fCbJLnZbVdi6Z2YxdDF1OgQZL3LroogGuetrwuA=
-github.com/dapr/kit v0.15.0 h1:446jrEOQV/0rt6FwmoKrifP3vav5+Uh/u38DqU8q+JM=
-github.com/dapr/kit v0.15.0/go.mod h1:HwFsBKEbcyLanWlDZE7u/jnaDCD/tU+n3pkFNUctQNw=
+github.com/dapr/dapr v1.15.5 h1:bkCmcQQfaQ5C49P3l0elCzDr4/Oja5kitM3jStY+2RY=
+github.com/dapr/dapr v1.15.5/go.mod h1:wwopO8AD9CZOgVj4bsdXNmeQujMo0v3MLAqeaX+gb00=
+github.com/dapr/durabletask-go v0.6.5 h1:aWcxMfYudojpgRjJRdUr7yyZ7rGcvLtWXUuA4cGHBR0=
+github.com/dapr/durabletask-go v0.6.5/go.mod h1:nTZ5fCbJLnZbVdi6Z2YxdDF1OgQZL3LroogGuetrwuA=
+github.com/dapr/kit v0.15.2 h1:5H9IhKScU/SpE2Hxvr5vUlmYN1e2MJN15RoT8/KSziU=
+github.com/dapr/kit v0.15.2/go.mod h1:HwFsBKEbcyLanWlDZE7u/jnaDCD/tU+n3pkFNUctQNw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
 github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -33,8 +33,8 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -63,33 +63,33 @@ github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8
 github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
-go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
-go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
-go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
-go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
-go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
-go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
-go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
-golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
-golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
+go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
+go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
+go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
+go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
+go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
+go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
+go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
+go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
+go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 h1:J1H9f+LEdWAfHcez/4cvaVBox7cOYT+IU6rgqj5x++8=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
-google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
-google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 h1:IqsN8hx+lWLqlN+Sc3DoMy/watjofWiU8sRFgQ8fhKM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
+google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/grpc/examples v0.0.0-20240516203910-e22436abb809 h1:f96Rv5C5Y2CWlbKK6KhKDdyFgGOjPHPEMsdyaxE9k0c=
 google.golang.org/grpc/examples v0.0.0-20240516203910-e22436abb809/go.mod h1:uaPEAc5V00jjG3DPhGFLXGT290RUV3+aNQigs1W50/8=
-google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
-google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -101,5 +101,5 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
-k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro=
+k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
diff --git a/examples/service/README.md b/examples/service/README.md
index 7fe90ef..8bbd337 100644
--- a/examples/service/README.md
+++ b/examples/service/README.md
@@ -16,7 +16,7 @@ output_match_mode: substring
 expected_stdout_lines:
   - "ContentType:text/plain, Verb:POST, QueryString:, hellow"
 background: true
-sleep: 15
+sleep: 30
 timeout_seconds: 60
 -->
 
diff --git a/go.mod b/go.mod
index 2737a4f..acc5ca0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,35 +1,34 @@
 module github.com/dapr/go-sdk
 
-go 1.23.6
+go 1.24.2
 
 require (
-	github.com/dapr/dapr v1.15.0-rc.17
-	github.com/dapr/durabletask-go v0.6.3
+	github.com/dapr/dapr v1.15.5
+	github.com/dapr/durabletask-go v0.6.5
 	github.com/go-chi/chi/v5 v5.1.0
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.6.0
 	github.com/stretchr/testify v1.10.0
-	google.golang.org/grpc v1.70.0
-	google.golang.org/protobuf v1.36.4
+	google.golang.org/grpc v1.72.0
+	google.golang.org/protobuf v1.36.6
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/dapr/kit v0.15.0 // indirect
+	github.com/dapr/kit v0.15.2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel v1.34.0 // indirect
-	go.opentelemetry.io/otel/metric v1.34.0 // indirect
-	go.opentelemetry.io/otel/trace v1.34.0 // indirect
-	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
-	golang.org/x/net v0.36.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
-	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
+	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
+	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
 )
diff --git a/go.sum b/go.sum
index 456920d..5ddb3aa 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,11 @@
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/dapr/dapr v1.15.0-rc.17 h1:bR0rd4FH81IteuOHTWVNyl58ZuQTDp3DYaTtXnpZ6JA=
-github.com/dapr/dapr v1.15.0-rc.17/go.mod h1:SD0AXom2XpX7pr8eYlbJ+gHfNREsflsrzCR19AZJ7/Q=
-github.com/dapr/durabletask-go v0.6.3 h1:WHhSAw1YL4xneK3Jo5nGfmMaJxfFodIIF5q1rpkDDfs=
-github.com/dapr/durabletask-go v0.6.3/go.mod h1:nTZ5fCbJLnZbVdi6Z2YxdDF1OgQZL3LroogGuetrwuA=
-github.com/dapr/kit v0.15.0 h1:446jrEOQV/0rt6FwmoKrifP3vav5+Uh/u38DqU8q+JM=
-github.com/dapr/kit v0.15.0/go.mod h1:HwFsBKEbcyLanWlDZE7u/jnaDCD/tU+n3pkFNUctQNw=
+github.com/dapr/dapr v1.15.5 h1:bkCmcQQfaQ5C49P3l0elCzDr4/Oja5kitM3jStY+2RY=
+github.com/dapr/dapr v1.15.5/go.mod h1:wwopO8AD9CZOgVj4bsdXNmeQujMo0v3MLAqeaX+gb00=
+github.com/dapr/durabletask-go v0.6.5 h1:aWcxMfYudojpgRjJRdUr7yyZ7rGcvLtWXUuA4cGHBR0=
+github.com/dapr/durabletask-go v0.6.5/go.mod h1:nTZ5fCbJLnZbVdi6Z2YxdDF1OgQZL3LroogGuetrwuA=
+github.com/dapr/kit v0.15.2 h1:5H9IhKScU/SpE2Hxvr5vUlmYN1e2MJN15RoT8/KSziU=
+github.com/dapr/kit v0.15.2/go.mod h1:HwFsBKEbcyLanWlDZE7u/jnaDCD/tU+n3pkFNUctQNw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -21,8 +21,8 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -43,26 +43,26 @@ github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
-go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
-go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
-go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
-go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
-go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
-go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
-go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
+go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
+go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
+go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
+go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
+go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
+go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
+go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
+go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
+go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
+go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc=
-golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
+golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
-golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -71,30 +71,30 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 h1:J1H9f+LEdWAfHcez/4cvaVBox7cOYT+IU6rgqj5x++8=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
-google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
-google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
-google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
-google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 h1:IqsN8hx+lWLqlN+Sc3DoMy/watjofWiU8sRFgQ8fhKM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
+google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
-k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro=
+k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
diff --git a/service/grpc/binding_test.go b/service/grpc/binding_test.go
index 3be71ca..765cb97 100644
--- a/service/grpc/binding_test.go
+++ b/service/grpc/binding_test.go
@@ -40,7 +40,7 @@ func TestListInputBindings(t *testing.T) {
 	require.NoError(t, err)
 	err = server.AddBindingInvocationHandler("test2", testBindingHandler)
 	require.NoError(t, err)
-	resp, err := server.ListInputBindings(context.Background(), &emptypb.Empty{})
+	resp, err := server.ListInputBindings(t.Context(), &emptypb.Empty{})
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
 	assert.Lenf(t, resp.GetBindings(), 2, "expected 2 handlers")
@@ -57,7 +57,7 @@ func TestBindingForErrors(t *testing.T) {
 
 // go test -timeout 30s ./service/grpc -count 1 -run ^TestBinding$
 func TestBinding(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 	methodName := "test"
 
 	server := getTestServer()
diff --git a/service/grpc/health_check_test.go b/service/grpc/health_check_test.go
index 460059a..732dbb7 100644
--- a/service/grpc/health_check_test.go
+++ b/service/grpc/health_check_test.go
@@ -37,7 +37,7 @@ func TestHealthCheckHandlerForErrors(t *testing.T) {
 
 // go test -timeout 30s ./service/grpc -count 1 -run ^TestHealthCheck$
 func TestHealthCheck(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	server := getTestServer()
 	startTestServer(server)
diff --git a/service/grpc/invoke_test.go b/service/grpc/invoke_test.go
index 1365172..bf980b7 100644
--- a/service/grpc/invoke_test.go
+++ b/service/grpc/invoke_test.go
@@ -67,21 +67,21 @@ func TestInvokeWithToken(t *testing.T) {
 		grpcMetadata := metadata.New(map[string]string{
 			cc.APITokenKey: os.Getenv(cc.AppAPITokenEnvVar),
 		})
-		ctx := metadata.NewIncomingContext(context.Background(), grpcMetadata)
+		ctx := metadata.NewIncomingContext(t.Context(), grpcMetadata)
 		in := &common.InvokeRequest{Method: methodName}
 		_, err := server.OnInvoke(ctx, in)
 		require.NoError(t, err)
 	})
 	t.Run("invoke with empty token, return failed", func(t *testing.T) {
 		in := &common.InvokeRequest{Method: methodName}
-		_, err := server.OnInvoke(context.Background(), in)
+		_, err := server.OnInvoke(t.Context(), in)
 		require.Error(t, err)
 	})
 	t.Run("invoke with mismatch token, return failed", func(t *testing.T) {
 		grpcMetadata := metadata.New(map[string]string{
 			cc.APITokenKey: "mismatch-token",
 		})
-		ctx := metadata.NewOutgoingContext(context.Background(), grpcMetadata)
+		ctx := metadata.NewOutgoingContext(t.Context(), grpcMetadata)
 		in := &common.InvokeRequest{Method: methodName}
 		_, err := server.OnInvoke(ctx, in)
 		require.Error(t, err)
@@ -93,7 +93,7 @@ func TestInvokeWithToken(t *testing.T) {
 func TestInvoke(t *testing.T) {
 	methodName := "test"
 	methodNameWithError := "error"
-	ctx := context.Background()
+	ctx := t.Context()
 
 	server := getTestServer()
 	err := server.AddServiceInvocationHandler("/"+methodName, testInvokeHandler)
diff --git a/service/grpc/topic_test.go b/service/grpc/topic_test.go
index 854362e..fb35258 100644
--- a/service/grpc/topic_test.go
+++ b/service/grpc/topic_test.go
@@ -57,7 +57,7 @@ func TestTopicSubscriptionList(t *testing.T) {
 	}
 	err := server.AddTopicEventHandler(sub1, eventHandler)
 	require.NoError(t, err)
-	resp, err := server.ListTopicSubscriptions(context.Background(), &emptypb.Empty{})
+	resp, err := server.ListTopicSubscriptions(t.Context(), &emptypb.Empty{})
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
 	if assert.Lenf(t, resp.GetSubscriptions(), 1, "expected 1 handlers") {
@@ -76,7 +76,7 @@ func TestTopicSubscriptionList(t *testing.T) {
 	}
 	err = server.AddTopicEventHandler(sub2, eventHandler)
 	require.NoError(t, err)
-	resp, err = server.ListTopicSubscriptions(context.Background(), &emptypb.Empty{})
+	resp, err = server.ListTopicSubscriptions(t.Context(), &emptypb.Empty{})
 	require.NoError(t, err)
 	assert.NotNil(t, resp)
 	if assert.Lenf(t, resp.GetSubscriptions(), 1, "expected 1 handlers") {
@@ -96,7 +96,7 @@ func TestTopicSubscriptionList(t *testing.T) {
 
 // go test -timeout 30s ./service/grpc -count 1 -run ^TestTopic$
 func TestTopic(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	sub := &common.Subscription{
 		PubsubName: "messages",
@@ -158,7 +158,7 @@ func TestTopic(t *testing.T) {
 			Topic:           sub2.Topic,
 			PubsubName:      sub2.PubsubName,
 		}
-		ctx := metadata.NewIncomingContext(context.Background(), metadata.New(map[string]string{"Metadata.key1": "value1"}))
+		ctx := metadata.NewIncomingContext(t.Context(), metadata.New(map[string]string{"Metadata.key1": "value1"}))
 		_, err = server.OnTopicEvent(ctx, in)
 		require.NoError(t, err)
 	})
@@ -167,7 +167,7 @@ func TestTopic(t *testing.T) {
 }
 
 func TestTopicWithValidationDisabled(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	sub := &common.Subscription{
 		PubsubName:             "messages",
@@ -197,7 +197,7 @@ func TestTopicWithValidationDisabled(t *testing.T) {
 }
 
 func TestTopicWithErrors(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	sub1 := &common.Subscription{
 		PubsubName: "messages",
@@ -269,7 +269,7 @@ func eventHandlerWithError(ctx context.Context, event *common.TopicEvent) (retry
 }
 
 func TestEventDataHandling(t *testing.T) {
-	ctx := context.Background()
+	ctx := t.Context()
 
 	tests := map[string]struct {
 		contentType string
diff --git a/tools/check-lint-version/main_test.go b/tools/check-lint-version/main_test.go
index ee9613c..5eda53e 100644
--- a/tools/check-lint-version/main_test.go
+++ b/tools/check-lint-version/main_test.go
@@ -28,7 +28,7 @@ func TestParseWorkflow(t *testing.T) {
 
 	t.Run("parse testing workflow file", func(t *testing.T) {
 		parsedVersion, err := parseWorkflowVersionFromFile("../../.github/workflows/test-tooling.yml")
-		assert.Equal(t, "v1.61.0", parsedVersion)
+		assert.Equal(t, "v1.64.6", parsedVersion)
 		require.NoError(t, err)
 	})
 }
@@ -36,7 +36,7 @@ func TestParseWorkflow(t *testing.T) {
 func TestGetCurrentVersion(t *testing.T) {
 	t.Run("get current version from system", func(t *testing.T) {
 		currentVersion, err := getCurrentVersion()
-		assert.Equal(t, "v1.61.0", currentVersion)
+		assert.Equal(t, "v1.64.6", currentVersion)
 		require.NoError(t, err)
 	})
 
@@ -49,23 +49,23 @@ func TestGetCurrentVersion(t *testing.T) {
 
 func TestIsVersionValid(t *testing.T) {
 	t.Run("compare versions - exactly equal to", func(t *testing.T) {
-		assert.True(t, true, isVersionValid("v1.54.2", "v1.54.2"))
+		assert.True(t, isVersionValid("v1.54.2", "v1.54.2"))
 	})
 
 	t.Run("compare versions - patch version greater (workflow)", func(t *testing.T) {
-		assert.True(t, true, isVersionValid("v1.54.3", "v1.54.2"))
+		assert.True(t, isVersionValid("v1.54.3", "v1.54.2"))
 	})
 
 	t.Run("compare versions - patch version greater (installed)", func(t *testing.T) {
-		assert.True(t, true, isVersionValid("v1.54.2", "v1.54.3"))
+		assert.True(t, isVersionValid("v1.54.2", "v1.54.3"))
 	})
 
 	t.Run("compare versions - invalid (installed)", func(t *testing.T) {
-		assert.False(t, false, isVersionValid("v1.54.2", "v1.52.2"))
+		assert.False(t, isVersionValid("v1.54.2", "v1.52.2"))
 	})
 
 	t.Run("compare versions - invalid (workflow)", func(t *testing.T) {
-		assert.False(t, false, isVersionValid("v1.52.2", "v1.54.2"))
+		assert.False(t, isVersionValid("v1.52.2", "v1.54.2"))
 	})
 }
 
diff --git a/workflow/activity_context_test.go b/workflow/activity_context_test.go
index be3b7a4..f033ada 100644
--- a/workflow/activity_context_test.go
+++ b/workflow/activity_context_test.go
@@ -29,6 +29,7 @@ import (
 
 type testingTaskActivityContext struct {
 	inputBytes []byte
+	ctx        context.Context
 }
 
 func (t *testingTaskActivityContext) GetInput(v any) error {
@@ -36,7 +37,7 @@ func (t *testingTaskActivityContext) GetInput(v any) error {
 }
 
 func (t *testingTaskActivityContext) Context() context.Context {
-	return context.TODO()
+	return t.ctx
 }
 
 func TestActivityContext(t *testing.T) {
@@ -44,7 +45,7 @@ func TestActivityContext(t *testing.T) {
 	inputBytes, err := json.Marshal(inputString)
 	require.NoErrorf(t, err, "required no error, but got %v", err)
 
-	ac := ActivityContext{ctx: &testingTaskActivityContext{inputBytes: inputBytes}}
+	ac := ActivityContext{ctx: &testingTaskActivityContext{inputBytes: inputBytes, ctx: t.Context()}}
 	t.Run("test getinput", func(t *testing.T) {
 		var inputReturn string
 		err := ac.GetInput(&inputReturn)
@@ -53,7 +54,7 @@ func TestActivityContext(t *testing.T) {
 	})
 
 	t.Run("test context", func(t *testing.T) {
-		assert.Equal(t, context.TODO(), ac.Context())
+		assert.Equal(t, t.Context(), ac.Context())
 	})
 }
 
diff --git a/workflow/client_test.go b/workflow/client_test.go
index 8cc57ca..9ec6327 100644
--- a/workflow/client_test.go
+++ b/workflow/client_test.go
@@ -15,7 +15,6 @@ limitations under the License.
 package workflow
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -52,7 +51,7 @@ func TestClientMethods(t *testing.T) {
 	testClient := Client{
 		taskHubClient: nil,
 	}
-	ctx := context.Background()
+	ctx := t.Context()
 	t.Run("ScheduleNewWorkflow - empty wf name", func(t *testing.T) {
 		id, err := testClient.ScheduleNewWorkflow(ctx, "", WithReuseIDPolicy(WorkflowIDReusePolicy{
 			OperationStatus: []Status{StatusCompleted},