diff --git a/cmd/gnmi/gnmi.go b/cmd/gnmi/gnmi.go
index df0a9121d909d03d2fe65b33f9156ca2bccc2aa7..7eb6853d82082d395e6c94bf04d49280f3c40bc6 100644
--- a/cmd/gnmi/gnmi.go
+++ b/cmd/gnmi/gnmi.go
@@ -32,7 +32,7 @@ func main() {
 		Addr:     "portainer.danet.fbi.h-da.de:6030",
 		Username: "admin",
 		Password: "arista",
-		Encoding: gpb.Encoding_PROTO,
+		Encoding: gpb.Encoding_JSON_IETF,
 	}
 	transport.SetConfig(cfg)
 
diff --git a/nucleus/gnmi_transport.go b/nucleus/gnmi_transport.go
index ce667b01581027bc1b9ec0f42c2bdaebcbfffbb3..5d9dde72e3fc9a4beb7d9bcfdb18d079579aa058 100644
--- a/nucleus/gnmi_transport.go
+++ b/nucleus/gnmi_transport.go
@@ -141,6 +141,7 @@ func (g *Gnmi) getWithRequest(ctx context.Context, req *gpb.GetRequest) (interfa
 // Set calls GNMI set
 func (g *Gnmi) set(ctx context.Context, setOps []*gnmi.Operation,
 	exts ...*gnmi_ext.Extension) error {
+	ctx = gnmi.NewContext(ctx, g.config)
 	client, err := gnmi.Dial(g.config)
 	if err != nil {
 		return err
@@ -150,6 +151,7 @@ func (g *Gnmi) set(ctx context.Context, setOps []*gnmi.Operation,
 
 // Subscribe calls GNMI subscribe
 func (g *Gnmi) subscribe(ctx context.Context) error {
+	ctx = gnmi.NewContext(ctx, g.config)
 	client, err := gnmi.Dial(g.config)
 	if err != nil {
 		return err