diff --git a/go.mod b/go.mod
index 0b504408..8ac42829 100644
--- a/go.mod
+++ b/go.mod
@@ -14,10 +14,10 @@ require (
 	github.com/google/uuid v1.2.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351
-	github.com/networkservicemesh/sdk v1.3.1
+	github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0
 	github.com/networkservicemesh/sdk-k8s v0.0.0-20220512022627-9bbb4a2c7b97
-	github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b
-	github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02
+	github.com/networkservicemesh/sdk-sriov v0.0.0-20220512103059-d007eaaff930
+	github.com/networkservicemesh/sdk-vpp v0.0.0-20220512103113-de5e9edebd74
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spiffe/go-spiffe/v2 v2.0.0
diff --git a/go.sum b/go.sum
index f18881a2..54ebbd49 100644
--- a/go.sum
+++ b/go.sum
@@ -378,20 +378,19 @@ github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4
 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0=
-github.com/networkservicemesh/api v1.3.1/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
 github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 h1:xkwnRaajnnqFPEbj5FrVVDjSgp+o5tiHqVb8W5cOAfI=
 github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
 github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s=
-github.com/networkservicemesh/sdk v1.3.1 h1:SGuhONUtEvRvNyHtYIJGnyIvW1bZ6yQHPHoTCsYOdKg=
-github.com/networkservicemesh/sdk v1.3.1/go.mod h1:E7EduCLfioJBrMyucSFiTZSkZjwxAQVByb5rtcCmjWM=
+github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 h1:7ObtZZ4na7PIkco8XTIiGTgh9FhvDtTqKHTS1epR5HI=
+github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20220512022627-9bbb4a2c7b97 h1:I7NNF/7lu/3PRqaMq7oTiQC8oNw0IXh52+5Aby2dGsA=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20220512022627-9bbb4a2c7b97/go.mod h1:K/xTiO13m+nSlSmV72XzYKQwG5SqYdzARrKt3lzC6yo=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5 h1:Ntnm27hxOVePlkdtPh/Xwhy3wuyXd84LqIQU1yS+dEY=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5/go.mod h1:U+mFUYf5bwyQzlJnNu5crGv9qF4M9MbCks0iKmNBJNg=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b h1:9RJC1InBV4P1feo+DxRfb22yyRB6zy27KoPwVyY7T84=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b/go.mod h1:igDwkyjuNFKqQPaREIPUiE9cZYdg1SB/SO8Uyn8zh8Q=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02 h1:Yn9DxwCF/peF+M9n+AuCELMZeESf+x6vwyttU8pWLcc=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02/go.mod h1:B5XXx8QQg4IMEKHDHKT1MTpkOnAnjrbn07tfkx6Pogg=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20220512090846-1ab1aa466ce0 h1:jA12434k3miWlCrT/IO9wmvlpvQqud8XtmNK/lcBJvQ=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20220512090846-1ab1aa466ce0/go.mod h1:ajoJFtAjgQ/UyotcgIbAv3a+x/c5DW6KwuXaLdWxKsY=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20220512103059-d007eaaff930 h1:FbcQTVmjg62s+H4/9brgvO+XAfHcA4Sl3AqBr3eYBp8=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20220512103059-d007eaaff930/go.mod h1:oKbRtbPyipQCSiKiaDKHTFOx9P3bB8fzh+9UVmMjhY0=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20220512103113-de5e9edebd74 h1:PMl1golx0Rtp90Eyy0gkN7lVZFM97jUuEO4whild9pc=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20220512103113-de5e9edebd74/go.mod h1:ZWjTxAuyS5Z09mX4U/p953h8HsjzEiVucQb+diSiP9Y=
 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=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
diff --git a/main.go b/main.go
index 88a18d25..678670ea 100644
--- a/main.go
+++ b/main.go
@@ -278,7 +278,8 @@ func main() {
 				credentials.NewTLS(
 					tlsconfig.MTLSClientConfig(source, source, tlsconfig.AuthorizeAny())))),
 	)
-	registryClient := registryclient.NewNetworkServiceEndpointRegistryClient(ctx, &cfg.ConnectTo,
+	registryClient := registryclient.NewNetworkServiceEndpointRegistryClient(ctx,
+		registryclient.WithClientURL(&cfg.ConnectTo),
 		registryclient.WithDialOptions(clientOptions...),
 		registryclient.WithNSEAdditionalFunctionality(
 			sendfd.NewNetworkServiceEndpointRegistryClient(),