diff --git a/go.mod b/go.mod
index cb8a4fd3..e12bdb8c 100644
--- a/go.mod
+++ b/go.mod
@@ -7,8 +7,8 @@ require (
 	github.com/edwarnicke/grpcfd v0.0.0-20210219150442-10fb469a6976
 	github.com/edwarnicke/serialize v1.0.7
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/networkservicemesh/api v0.0.0-20210305165706-bcfdc8d78700
-	github.com/networkservicemesh/sdk v0.0.0-20210322090132-801aa9713ef0
+	github.com/networkservicemesh/api v0.0.0-20210323151719-3156ce7533e9
+	github.com/networkservicemesh/sdk v0.0.0-20210323152422-a9754c798b74
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	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 c2188abb..1583d38b 100644
--- a/go.sum
+++ b/go.sum
@@ -120,10 +120,10 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nats-io/stan.go v0.6.0/go.mod h1:eIcD5bi3pqbHT/xIIvXMwvzXYElgouBvaVRftaE+eac=
-github.com/networkservicemesh/api v0.0.0-20210305165706-bcfdc8d78700 h1:c4M5DLI0L3IMx56Gqnt6kQ4SAF0tRCu0thxH2gmTxCE=
-github.com/networkservicemesh/api v0.0.0-20210305165706-bcfdc8d78700/go.mod h1:qvxdY1Zt4QTtiG+uH1XmjpegeHjlt5Jj4A8iK55iJPI=
-github.com/networkservicemesh/sdk v0.0.0-20210322090132-801aa9713ef0 h1:wrDC/zHuIxmUbctxoH2eZmsebZLZ9xSt46PKLMEmxCs=
-github.com/networkservicemesh/sdk v0.0.0-20210322090132-801aa9713ef0/go.mod h1:+LVOGPLY1FYgFW+ROUR5jxq/9pUl8NDSbq/8xyoUqxA=
+github.com/networkservicemesh/api v0.0.0-20210323151719-3156ce7533e9 h1:fthzwqhZV4wvTe0YHK2ZS6pTsOUETMWsLhVC16PRtaE=
+github.com/networkservicemesh/api v0.0.0-20210323151719-3156ce7533e9/go.mod h1:qvxdY1Zt4QTtiG+uH1XmjpegeHjlt5Jj4A8iK55iJPI=
+github.com/networkservicemesh/sdk v0.0.0-20210323152422-a9754c798b74 h1:wjNgZqAQTQ5p+MS/D30rhXOzrc8lISaA7vmijZMjPFg=
+github.com/networkservicemesh/sdk v0.0.0-20210323152422-a9754c798b74/go.mod h1:Pz5dfF3iV3JaW1QwtTeZyU/s8Jd14lcgG4s9O9xDGnQ=
 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/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go
index 45b432b6..c1f4bb1e 100644
--- a/internal/imports/imports_linux.go
+++ b/internal/imports/imports_linux.go
@@ -18,6 +18,7 @@ import (
 	_ "github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
 	_ "github.com/networkservicemesh/sdk/pkg/networkservice/common/clienturl"
 	_ "github.com/networkservicemesh/sdk/pkg/networkservice/common/connect"
+	_ "github.com/networkservicemesh/sdk/pkg/networkservice/common/heal"
 	_ "github.com/networkservicemesh/sdk/pkg/networkservice/common/setextracontext"
 	_ "github.com/networkservicemesh/sdk/pkg/networkservice/core/adapters"
 	_ "github.com/networkservicemesh/sdk/pkg/registry/common/interpose"
diff --git a/test/client_endpoint_test.go b/test/client_endpoint_test.go
index eb4a4191..ed640999 100644
--- a/test/client_endpoint_test.go
+++ b/test/client_endpoint_test.go
@@ -36,6 +36,7 @@ import (
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/clienturl"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/connect"
+	"github.com/networkservicemesh/sdk/pkg/networkservice/common/heal"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/adapters"
 	"github.com/networkservicemesh/sdk/pkg/registry/common/interpose"
 	"github.com/networkservicemesh/sdk/pkg/registry/core/chain"
@@ -81,11 +82,11 @@ func newCrossNSE(ctx context.Context, name string, connectTo *url.URL, tokenGene
 		// Statically set the url we use to the unix file socket for the NSMgr
 		endpoint.WithAdditionalFunctionality(
 			clienturl.NewServer(connectTo),
+			heal.NewServer(ctx, addressof.NetworkServiceClient(adapters.NewServerToClient(crossNSe))),
 			connect.NewServer(
 				ctx,
 				client.NewClientFactory(
 					client.WithName(name),
-					client.WithHeal(addressof.NetworkServiceClient(adapters.NewServerToClient(crossNSe))),
 				),
 				connect.WithDialOptions(clientDialOptions...),
 			),