diff --git a/cmd/generate-certs/generate-certs.go b/cmd/generate-certs/generate-certs.go
index a6db4ed..e976893 100644
--- a/cmd/generate-certs/generate-certs.go
+++ b/cmd/generate-certs/generate-certs.go
@@ -2,10 +2,9 @@ package generate_certs
 
 import (
 	"context"
-	"github.com/hashicorp/yamux"
+	"github.com/kfsoftware/getout/pkg/tunnel"
 	"github.com/kfsoftware/hlf-cc-dev/gql/models"
 	"github.com/kfsoftware/hlf-cc-dev/log"
-	"github.com/kfsoftware/getout/pkg/tunnel"
 	"github.com/pkg/errors"
 	"github.com/shurcooL/graphql"
 	"github.com/spf13/cobra"
@@ -107,7 +106,6 @@ func (c startCmd) run() error {
 	ctx := context.Background()
 	input := models.DeployChaincodeInput{
 		Name:             c.chaincode,
-		TenantID:         c.tenant,
 		ChaincodeAddress: c.chaincodeAddress,
 	}
 	var m struct {
@@ -158,23 +156,10 @@ func (c startCmd) run() error {
 	return err
 }
 func startTunnel(tunnelAddr string, localAddress string, sni string) error {
-	conn, err := net.Dial("tcp", tunnelAddr)
-	if err != nil {
-		panic(err)
-	}
-	session, err := yamux.Client(conn, nil)
-	if err != nil {
-		panic(err)
-	}
 	tunnelCli := tunnel.NewTunnelClient(
-		session,
-		localAddress,
+		tunnelAddr,
 	)
-	err = tunnelCli.StartTlsTunnel(sni)
-	if err != nil {
-		return err
-	}
-	err = tunnelCli.Start()
+	err := tunnelCli.StartTlsTunnel(sni, localAddress)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/start/start.go b/cmd/start/start.go
index fbd3bfd..8636020 100644
--- a/cmd/start/start.go
+++ b/cmd/start/start.go
@@ -64,7 +64,7 @@ type startCmd struct {
 
 func (c startCmd) validate() error {
 	if c.tunnelAddress == "" {
-		return errors.New("--tunnel-addr is required")
+		return errors.New("--tunnelAddress is required")
 	}
 	if c.signaturePolicy == "" {
 		return errors.New("--signaturePolicy is required")
@@ -126,7 +126,7 @@ func (c startCmd) run() error {
 	tunnelCFGItem, err := tunnelConfig.Get(tunnelKey)
 	if err != nil {
 		return errors.Wrapf(err, `failed to get tunnel config, run the following command
-hlf-cc-dev listen --forward-to=%s --tunnel-addr="xxx:8082"
+hlf-cc-dev listen --forward-to=%s --tunnelAddress="xxx:8082"
 `, c.localChaincodeAddress)
 	}
 
@@ -306,7 +306,7 @@ func NewStartCmd() *cobra.Command {
 	f := cmd.Flags()
 	f.StringVar(&c.chaincode, "chaincode", "", "chaincode name within the channel")
 	f.StringVar(&c.localChaincodeAddress, "localChaincode", "", "address of the local chaincode server, example: localhost:9999")
-	f.StringVar(&c.tunnelAddress, "tunnel-addr", "", "remote tunnel address, example: localhost:9999")
+	f.StringVar(&c.tunnelAddress, "tunnelAddress", "", "remote tunnel address, example: localhost:9999")
 	f.StringVar(&c.apiUrl, "apiUrl", "", "apiUrl to interact with the peers")
 	f.StringVar(&c.pdcFile, "pdc", "", "pdc file json, see examples/pdc.json")
 	f.StringVar(&c.accessToken, "accessToken", "", "access token")