diff --git a/go.mod b/go.mod
index 36fdf2f..64c769f 100644
--- a/go.mod
+++ b/go.mod
@@ -10,8 +10,8 @@ require (
 	github.com/edwarnicke/vpphelper v0.0.0-20210225052320-b4f1f1aff45d
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a
-	github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b
-	github.com/networkservicemesh/sdk-vpp v0.0.0-20211202072305-fee5b16772b8
+	github.com/networkservicemesh/sdk v0.5.1-0.20211209170740-8e964705e604
+	github.com/networkservicemesh/sdk-vpp v0.0.0-20211209201026-f5129e1ae6c9
 	github.com/sirupsen/logrus v1.7.0
 	github.com/spiffe/go-spiffe/v2 v2.0.0-beta.4
 	google.golang.org/grpc v1.35.0
diff --git a/go.sum b/go.sum
index 24e4486..27715d0 100644
--- a/go.sum
+++ b/go.sum
@@ -159,11 +159,11 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
 github.com/nats-io/stan.go v0.10.0/go.mod h1:0jEuBXKauB1HHJswHM/lx05K48TJ1Yxj6VIfM4k+aB4=
 github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a h1:gSujYHmGiOpJyzPGZdW2ymMpmDHCMBdbUMXCVzOtrh8=
 github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
-github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b h1:g0t17i2/Go2vtRrCBQoiwxskyn9QPCbvhtn9pYsVPi8=
-github.com/networkservicemesh/sdk v0.5.1-0.20211202071606-292c0c4ea23b/go.mod h1:9ZCaoauLu+52PLj/BXnYH5w9Pk9jdhaeMA14zb0PUxA=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20211202071849-d81fc334ecf5/go.mod h1:THpAHEL81PBAmpYcWX5DJJGfjq6xHxu6YjVttxz2iEg=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20211202072305-fee5b16772b8 h1:Xs56ODwU0mdGq0umCMA9Ei9j3wwkRrES+q4Y5ZH137g=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20211202072305-fee5b16772b8/go.mod h1:fD7Qwr5ilsfs7atlE9zDikWoe1yQBzxKFsVjGek50Qo=
+github.com/networkservicemesh/sdk v0.5.1-0.20211209170740-8e964705e604 h1:9jGY0opa023WFE3QUtLVYgZRwU7njUiXghRmhD+VxbA=
+github.com/networkservicemesh/sdk v0.5.1-0.20211209170740-8e964705e604/go.mod h1:9ZCaoauLu+52PLj/BXnYH5w9Pk9jdhaeMA14zb0PUxA=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20211209171028-4ae4c5632077/go.mod h1:WEmSY7u0R4RVNOjcL3qh4Kl1yJ+kgsUtxMLGETzftco=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20211209201026-f5129e1ae6c9 h1:huf10xEFdbQ2hEepTkHWp7Fvz459zh/mUt8carrDS0k=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20211209201026-f5129e1ae6c9/go.mod h1:854RKP1vCDjgEwcuN4kdyVED10PcL/zEhvHu3VQd7HM=
 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=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
diff --git a/main.go b/main.go
index b88b1fd..b48acc8 100644
--- a/main.go
+++ b/main.go
@@ -75,8 +75,7 @@ func main() {
 	// ********************************************************************************
 	logrus.SetFormatter(&nested.Formatter{})
 	log.EnableTracing(true)
-	ctx = log.WithFields(ctx, map[string]interface{}{"cmd": os.Args[0]})
-	ctx = log.WithLog(ctx, logruslogger.New(ctx))
+	ctx = log.WithLog(ctx, logruslogger.New(ctx, map[string]interface{}{"cmd": os.Args[0]}))
 
 	// ********************************************************************************
 	// Debug self if necessary