diff --git a/go.mod b/go.mod
index 0aaa6059..2161df1d 100644
--- a/go.mod
+++ b/go.mod
@@ -13,10 +13,10 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e
-	github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d
+	github.com/networkservicemesh/sdk v0.5.1-0.20211014092525-f264fec6da05
 	github.com/networkservicemesh/sdk-k8s v0.0.0-20210923132245-8709b6f366a4
-	github.com/networkservicemesh/sdk-sriov v0.0.0-20210924085919-868bbc152fb4
-	github.com/networkservicemesh/sdk-vpp v0.0.0-20211013103458-d541552ca8a7
+	github.com/networkservicemesh/sdk-sriov v0.0.0-20211014093500-f12ea1fa1fb9
+	github.com/networkservicemesh/sdk-vpp v0.0.0-20211014093248-93bf10712736
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.7.0
 	github.com/spiffe/go-spiffe/v2 v2.0.0-beta.2
diff --git a/go.sum b/go.sum
index 6eb493d6..ce9b78dd 100644
--- a/go.sum
+++ b/go.sum
@@ -243,8 +243,9 @@ github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrj
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
@@ -343,17 +344,16 @@ github.com/nats-io/stan.go v0.6.0/go.mod h1:eIcD5bi3pqbHT/xIIvXMwvzXYElgouBvaVRf
 github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e h1:PO6tDo/bGLJqz1qiqCecht/HqMWCKunAds2U9Hvc0yM=
 github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
 github.com/networkservicemesh/sdk v0.5.1-0.20210923121729-a96ead921c0e/go.mod h1:eISPu+ySJJ46kg03ZTi/xmpNSU+K4cImwq++ZbDV4F4=
-github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d h1:x45/M58BggOOrFa5dCVn+xS80lPdoNO29UDQbrooSOA=
-github.com/networkservicemesh/sdk v0.5.1-0.20211012205451-4807755c335d/go.mod h1:j/XeYOfyRzuQBV4llU+qTOhN7aZSMO6scfHI9adWdzc=
+github.com/networkservicemesh/sdk v0.5.1-0.20211014092525-f264fec6da05 h1:oKButffgafeq8d1X/0DyvGETzLApGpu3c+xjrgefOwk=
+github.com/networkservicemesh/sdk v0.5.1-0.20211014092525-f264fec6da05/go.mod h1:j/XeYOfyRzuQBV4llU+qTOhN7aZSMO6scfHI9adWdzc=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20210923132245-8709b6f366a4 h1:VOHwyZ2nfbBm9Q6OwrcIZUEdv+vJeAeKf+PDvmOsVe0=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20210923132245-8709b6f366a4/go.mod h1:oGil93QdvBaN+59UyauqMOhZ6OsKmGSOxycODr5AdR4=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20210923122046-7d822150f22a/go.mod h1:qDNhKWmvnMvCs19+YF+4tgYwG0+fN2uNW95jr8VqzjI=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20211012205730-4144088fedac h1:eVg90XP83nYCzlqY2CFznm1OtCb3FS5wFjoRmzfgE9U=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20211012205730-4144088fedac/go.mod h1:4le9X2gv+aPVVYkfq9c0pCFuKsEMKkC3wzNDVP+sfZM=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20210924085919-868bbc152fb4 h1:NA8YzBX8W28MMDYMmPk99tKf5ijD3zYE0DYfAKOZxEc=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20210924085919-868bbc152fb4/go.mod h1:agnfxvuC9k/LTBT7azseDToGC5GKvJbAwohBy8f40i4=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20211013103458-d541552ca8a7 h1:tdhSAahBhDQNeKkJjERZO+UPTfkHWtKsohoNNnfnrsw=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20211013103458-d541552ca8a7/go.mod h1:8mXIUHu6pjMcV3z7F0J+u/PgJenLjX5XX/HbWysd0i8=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20211014092923-08c76a5ebb5c h1:Qh/zpbpupujQ7WtbbE33cIzKaV3JLrie9TsGjslFsgo=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20211014092923-08c76a5ebb5c/go.mod h1:3bouhA9gAe0mMpnohxDD7xYGkNhiEEQQgBywT/iwQtM=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20211014093500-f12ea1fa1fb9 h1:mrgAnF9j3UIMgwhvgBxbL7YiX3kR+RedjlFbhS20bEA=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20211014093500-f12ea1fa1fb9/go.mod h1:y3cWs+kbipNsskTzRuGtFsQvvMNF54wb5fWkm+E379Q=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20211014093248-93bf10712736 h1:2k+W16RBU/d/99kxRbr7Tv95IHGswEbqqbiSPNyewoE=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20211014093248-93bf10712736/go.mod h1:aX1YgLm6ZsXwpwFzo4UKbVh3dow5pmCAKGwhuZdLl4I=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
diff --git a/internal/tests/suite_kernel_test.go b/internal/tests/suite_kernel_test.go
index 206e671f..8d748236 100644
--- a/internal/tests/suite_kernel_test.go
+++ b/internal/tests/suite_kernel_test.go
@@ -162,7 +162,9 @@ func newKernelVerifiableClient(ctx context.Context, sutCC grpc.ClientConnInterfa
 	rv := &kernelVerifiableClient{
 		ctx:            ctx,
 		clientNSHandle: clientNSHandle,
-		NetworkServiceClient: client.NewClientFactory(
+		NetworkServiceClient: client.NewClient(
+			ctx,
+			client.WithClientConn(sutCC),
 			client.WithName("kernelVerifiableClient"),
 			client.WithAdditionalFunctionality(
 				ns.NewClient(clientNSHandle),
@@ -170,7 +172,7 @@ func newKernelVerifiableClient(ctx context.Context, sutCC grpc.ClientConnInterfa
 				sendfd.NewClient(),
 				ns.NewClient(rootNSHandle),
 			),
-		)(ctx, sutCC),
+		),
 	}
 	return rv
 }
diff --git a/internal/tests/suite_memif_test.go b/internal/tests/suite_memif_test.go
index fa229e3c..112ea57e 100644
--- a/internal/tests/suite_memif_test.go
+++ b/internal/tests/suite_memif_test.go
@@ -114,8 +114,10 @@ func newMemifVerifiableClient(ctx context.Context, sutCC grpc.ClientConnInterfac
 	rv := &memifVerifiableClient{
 		ctx:     ctx,
 		vppConn: vppConn,
-		NetworkServiceClient: client.NewClientFactory(
+		NetworkServiceClient: client.NewClient(
+			ctx,
 			client.WithName("memifVerifiableClient"),
+			client.WithClientConn(sutCC),
 			client.WithAdditionalFunctionality(
 				metadata.NewClient(),
 				up.NewClient(ctx, vppConn),
@@ -124,7 +126,7 @@ func newMemifVerifiableClient(ctx context.Context, sutCC grpc.ClientConnInterfac
 				sendfd.NewClient(),
 				recvfd.NewClient(),
 			),
-		)(ctx, sutCC),
+		),
 	}
 	return rv
 }
diff --git a/internal/tests/suite_vxlan_test.go b/internal/tests/suite_vxlan_test.go
index 3fb7974d..c5f8e37b 100644
--- a/internal/tests/suite_vxlan_test.go
+++ b/internal/tests/suite_vxlan_test.go
@@ -100,14 +100,16 @@ func newVxlanVerifiableClient(
 	return &vxlanVerifiableClient{
 		ctx:     ctx,
 		vppConn: vppConn,
-		NetworkServiceClient: client.NewClientFactory(
+		NetworkServiceClient: client.NewClient(
+			ctx,
 			client.WithName("vxlanVerifiableClient"),
+			client.WithClientConn(sutCC),
 			client.WithAdditionalFunctionality(
 				connectioncontext.NewClient(vppConn),
 				pinhole.NewClient(vppConn),
 				vxlan.NewClient(vppConn, net.ParseIP(clientIP)),
 			),
-		)(ctx, sutCC),
+		),
 	}
 }
 
diff --git a/internal/tests/suite_wireguard_test.go b/internal/tests/suite_wireguard_test.go
index ada3263f..14734356 100644
--- a/internal/tests/suite_wireguard_test.go
+++ b/internal/tests/suite_wireguard_test.go
@@ -23,15 +23,16 @@ import (
 	"github.com/edwarnicke/vpphelper"
 	"google.golang.org/grpc"
 
+	"github.com/networkservicemesh/sdk/pkg/networkservice/chains/client"
+
+	"github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/ipam/point2pointipam"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
 
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
-	"github.com/networkservicemesh/sdk/pkg/networkservice/chains/client"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/chains/endpoint"
-	"github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
 	"github.com/networkservicemesh/sdk/pkg/tools/token"
 
 	"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/connectioncontext"
@@ -101,15 +102,17 @@ func newWireguardVerifiableClient(
 	return &vxlanVerifiableClient{
 		ctx:     ctx,
 		vppConn: vppConn,
-		NetworkServiceClient: client.NewClientFactory(
+		NetworkServiceClient: client.NewClient(
+			ctx,
 			client.WithName("vxlanVerifiableClient"),
+			client.WithClientConn(sutCC),
 			client.WithAdditionalFunctionality(
 				up.NewClient(ctx, vppConn),
 				connectioncontext.NewClient(vppConn),
 				wireguard.NewClient(vppConn, net.ParseIP(clientIP)),
 				pinhole.NewClient(vppConn),
 			),
-		)(ctx, sutCC),
+		),
 	}
 }