diff --git a/pkg/adapters/common/adapter_proxy.go b/pkg/adapters/common/adapter_proxy.go
index fee70c8..ebef281 100644
--- a/pkg/adapters/common/adapter_proxy.go
+++ b/pkg/adapters/common/adapter_proxy.go
@@ -21,8 +21,8 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"time"
 )
diff --git a/pkg/adapters/common/core_proxy.go b/pkg/adapters/common/core_proxy.go
index 1daeacb..18e454f 100644
--- a/pkg/adapters/common/core_proxy.go
+++ b/pkg/adapters/common/core_proxy.go
@@ -19,8 +19,8 @@
 	"context"
 	"github.com/golang/protobuf/ptypes"
 	a "github.com/golang/protobuf/ptypes/any"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"github.com/opencord/voltha-protos/go/voltha"
 	"google.golang.org/grpc/codes"
diff --git a/pkg/adapters/common/core_proxy_test.go b/pkg/adapters/common/core_proxy_test.go
index 40825a9..08e887e 100644
--- a/pkg/adapters/common/core_proxy_test.go
+++ b/pkg/adapters/common/core_proxy_test.go
@@ -16,7 +16,7 @@
 package common
 
 import (
-	adapterIf "github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
+	adapterIf "github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
 	"testing"
 )
 
diff --git a/pkg/adapters/common/events_proxy.go b/pkg/adapters/common/events_proxy.go
index 25b1be4..0f966d3 100644
--- a/pkg/adapters/common/events_proxy.go
+++ b/pkg/adapters/common/events_proxy.go
@@ -23,9 +23,9 @@
 	"strings"
 	"time"
 
-	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
+	"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/pkg/adapters/common/request_handler.go b/pkg/adapters/common/request_handler.go
index 27f9846..3a51996 100644
--- a/pkg/adapters/common/request_handler.go
+++ b/pkg/adapters/common/request_handler.go
@@ -19,10 +19,10 @@
 	"errors"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/opencord/voltha-lib-go/pkg/adapters"
-	"github.com/opencord/voltha-lib-go/pkg/adapters/adapterif"
-	"github.com/opencord/voltha-lib-go/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/adapters"
+	"github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
+	"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"github.com/opencord/voltha-protos/go/openflow_13"
 	"github.com/opencord/voltha-protos/go/voltha"
diff --git a/pkg/db/kvstore/client.go b/pkg/db/kvstore/client.go
index f40d10e..c0ebe5f 100644
--- a/pkg/db/kvstore/client.go
+++ b/pkg/db/kvstore/client.go
@@ -16,7 +16,7 @@
 package kvstore
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 )
 
 const (
diff --git a/pkg/db/kvstore/consulclient.go b/pkg/db/kvstore/consulclient.go
index c3e3999..e0e8550 100644
--- a/pkg/db/kvstore/consulclient.go
+++ b/pkg/db/kvstore/consulclient.go
@@ -19,7 +19,7 @@
 	"bytes"
 	"context"
 	"errors"
-	log "github.com/opencord/voltha-lib-go/pkg/log"
+	log "github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"sync"
 	"time"
 	//log "ciena.com/coordinator/common"
diff --git a/pkg/db/kvstore/etcdclient.go b/pkg/db/kvstore/etcdclient.go
index beac4e0..8db047c 100644
--- a/pkg/db/kvstore/etcdclient.go
+++ b/pkg/db/kvstore/etcdclient.go
@@ -19,7 +19,7 @@
 	"context"
 	"errors"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	v3Client "go.etcd.io/etcd/clientv3"
 	v3Concurrency "go.etcd.io/etcd/clientv3/concurrency"
 	v3rpcTypes "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
diff --git a/pkg/db/model/backend.go b/pkg/db/model/backend.go
index fb2c813..f5ead88 100644
--- a/pkg/db/model/backend.go
+++ b/pkg/db/model/backend.go
@@ -19,8 +19,8 @@
 import (
 	"errors"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"strconv"
 	"sync"
 	"time"
diff --git a/pkg/db/model/base_test.go b/pkg/db/model/base_test.go
index d4c7d3a..4f44e45 100644
--- a/pkg/db/model/base_test.go
+++ b/pkg/db/model/base_test.go
@@ -16,7 +16,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 	"runtime/debug"
 	"sync"
diff --git a/pkg/db/model/branch.go b/pkg/db/model/branch.go
index 2075b7e..957e0ca 100644
--- a/pkg/db/model/branch.go
+++ b/pkg/db/model/branch.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"sync"
 )
 
diff --git a/pkg/db/model/child_type.go b/pkg/db/model/child_type.go
index fae9844..016d7a2 100644
--- a/pkg/db/model/child_type.go
+++ b/pkg/db/model/child_type.go
@@ -20,7 +20,7 @@
 	desc "github.com/golang/protobuf/descriptor"
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/common"
 	"reflect"
 	"strconv"
diff --git a/pkg/db/model/data_revision.go b/pkg/db/model/data_revision.go
index b930ae1..35f5958 100644
--- a/pkg/db/model/data_revision.go
+++ b/pkg/db/model/data_revision.go
@@ -22,7 +22,7 @@
 	"encoding/json"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 )
 
diff --git a/pkg/db/model/event_bus.go b/pkg/db/model/event_bus.go
index 3af2556..a7bd040 100644
--- a/pkg/db/model/event_bus.go
+++ b/pkg/db/model/event_bus.go
@@ -19,7 +19,7 @@
 import (
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/pkg/db/model/event_bus_client.go b/pkg/db/model/event_bus_client.go
index fdc02f9..b9c6431 100644
--- a/pkg/db/model/event_bus_client.go
+++ b/pkg/db/model/event_bus_client.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/voltha"
 )
 
diff --git a/pkg/db/model/merge.go b/pkg/db/model/merge.go
index 752d025..07ae9b9 100644
--- a/pkg/db/model/merge.go
+++ b/pkg/db/model/merge.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 )
 
 func revisionsAreEqual(a, b []Revision) bool {
diff --git a/pkg/db/model/model.go b/pkg/db/model/model.go
index 8087919..ba4a9b1 100644
--- a/pkg/db/model/model.go
+++ b/pkg/db/model/model.go
@@ -16,7 +16,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 )
 
 func init() {
diff --git a/pkg/db/model/node.go b/pkg/db/model/node.go
index 7fd0250..264a9dd 100644
--- a/pkg/db/model/node.go
+++ b/pkg/db/model/node.go
@@ -23,7 +23,7 @@
 	"context"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"strings"
 	"sync"
diff --git a/pkg/db/model/non_persisted_revision.go b/pkg/db/model/non_persisted_revision.go
index 514b3b3..384caed 100644
--- a/pkg/db/model/non_persisted_revision.go
+++ b/pkg/db/model/non_persisted_revision.go
@@ -21,8 +21,8 @@
 	"crypto/md5"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"sort"
 	"strings"
diff --git a/pkg/db/model/persisted_revision.go b/pkg/db/model/persisted_revision.go
index 8ab182b..53d93b7 100644
--- a/pkg/db/model/persisted_revision.go
+++ b/pkg/db/model/persisted_revision.go
@@ -22,8 +22,8 @@
 	"context"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"strings"
 	"sync"
diff --git a/pkg/db/model/profiling.go b/pkg/db/model/profiling.go
index c50c9f6..f8e9f7a 100644
--- a/pkg/db/model/profiling.go
+++ b/pkg/db/model/profiling.go
@@ -17,7 +17,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"sync"
 )
 
diff --git a/pkg/db/model/proxy.go b/pkg/db/model/proxy.go
index 2d2c24e..b5378fe 100644
--- a/pkg/db/model/proxy.go
+++ b/pkg/db/model/proxy.go
@@ -22,7 +22,7 @@
 	"errors"
 	"fmt"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"runtime"
 	"strings"
diff --git a/pkg/db/model/proxy_load_test.go b/pkg/db/model/proxy_load_test.go
index 056d3c1..9a3d1a2 100644
--- a/pkg/db/model/proxy_load_test.go
+++ b/pkg/db/model/proxy_load_test.go
@@ -19,7 +19,7 @@
 	"context"
 	"encoding/hex"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/opencord/voltha-protos/go/common"
 	"github.com/opencord/voltha-protos/go/openflow_13"
 	"github.com/opencord/voltha-protos/go/voltha"
@@ -94,7 +94,7 @@
 	if err := log.UpdateAllLoggers(log.Fields{"instanceId": "PLT"}); err != nil {
 		log.With(log.Fields{"error": err}).Fatal("Cannot setup logging")
 	}
-	log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/pkg/db/model", log.DebugLevel)
+	log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v2/pkg/db/model", log.DebugLevel)
 
 	BenchmarkProxy_DeviceProxy = BenchmarkProxy_Root.node.CreateProxy(context.Background(), "/", false)
 	// Register ADD instructions callbacks
diff --git a/pkg/db/model/revision.go b/pkg/db/model/revision.go
index 71c5d0c..29fc5e9 100644
--- a/pkg/db/model/revision.go
+++ b/pkg/db/model/revision.go
@@ -17,7 +17,7 @@
 
 import (
 	"context"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
 	"time"
 )
 
diff --git a/pkg/db/model/root.go b/pkg/db/model/root.go
index 20c3721..771f938 100644
--- a/pkg/db/model/root.go
+++ b/pkg/db/model/root.go
@@ -22,7 +22,7 @@
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"reflect"
 	"sync"
 )
diff --git a/pkg/db/model/transaction.go b/pkg/db/model/transaction.go
index 5bef77e..d7a34e7 100644
--- a/pkg/db/model/transaction.go
+++ b/pkg/db/model/transaction.go
@@ -17,7 +17,7 @@
 
 import (
 	"context"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 )
 
 type Transaction struct {
diff --git a/pkg/flows/flow_utils.go b/pkg/flows/flow_utils.go
index 2dbf52d..aeecc03 100644
--- a/pkg/flows/flow_utils.go
+++ b/pkg/flows/flow_utils.go
@@ -21,7 +21,7 @@
 	"fmt"
 	"github.com/cevaris/ordered_map"
 	"github.com/gogo/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	"math/big"
 	"strings"
diff --git a/pkg/flows/flow_utils_test.go b/pkg/flows/flow_utils_test.go
index d611b04..cf6abf0 100644
--- a/pkg/flows/flow_utils_test.go
+++ b/pkg/flows/flow_utils_test.go
@@ -16,7 +16,7 @@
 package flows
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ofp "github.com/opencord/voltha-protos/go/openflow_13"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/codes"
diff --git a/pkg/grpc/server.go b/pkg/grpc/server.go
index d2438e0..4c95aa1 100644
--- a/pkg/grpc/server.go
+++ b/pkg/grpc/server.go
@@ -18,7 +18,7 @@
 import (
 	"context"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"net"
diff --git a/pkg/kafka/kafka_inter_container_library.go b/pkg/kafka/kafka_inter_container_library.go
index d2e0702..e265928 100644
--- a/pkg/kafka/kafka_inter_container_library.go
+++ b/pkg/kafka/kafka_inter_container_library.go
@@ -23,7 +23,7 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"reflect"
 	"strings"
diff --git a/pkg/kafka/sarama_client.go b/pkg/kafka/sarama_client.go
index cec18ec..854b3e2 100755
--- a/pkg/kafka/sarama_client.go
+++ b/pkg/kafka/sarama_client.go
@@ -22,7 +22,7 @@
 	scc "github.com/bsm/sarama-cluster"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	ic "github.com/opencord/voltha-protos/go/inter_container"
 	"strings"
 	"sync"
diff --git a/pkg/ponresourcemanager/ponresourcemanager.go b/pkg/ponresourcemanager/ponresourcemanager.go
index 12e6a3c..4422a10 100755
--- a/pkg/ponresourcemanager/ponresourcemanager.go
+++ b/pkg/ponresourcemanager/ponresourcemanager.go
@@ -24,10 +24,10 @@
 	"strconv"
 
 	bitmap "github.com/boljen/go-bitmap"
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
-	"github.com/opencord/voltha-lib-go/pkg/log"
-	tp "github.com/opencord/voltha-lib-go/pkg/techprofile"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	tp "github.com/opencord/voltha-lib-go/v2/pkg/techprofile"
 )
 
 const (
diff --git a/pkg/probe/probe.go b/pkg/probe/probe.go
index 192c7ca..9823566 100644
--- a/pkg/probe/probe.go
+++ b/pkg/probe/probe.go
@@ -18,7 +18,7 @@
 import (
 	"context"
 	"fmt"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"net/http"
 	"sync"
 )
diff --git a/pkg/probe/probe_test.go b/pkg/probe/probe_test.go
index 79bfc77..2a797d6 100644
--- a/pkg/probe/probe_test.go
+++ b/pkg/probe/probe_test.go
@@ -18,7 +18,7 @@
 import (
 	"context"
 	"encoding/json"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"net/http"
diff --git a/pkg/techprofile/config.go b/pkg/techprofile/config.go
index f9655a8..3a45af1 100644
--- a/pkg/techprofile/config.go
+++ b/pkg/techprofile/config.go
@@ -16,7 +16,7 @@
 package techprofile
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
 )
 
 // tech profile default constants
diff --git a/pkg/techprofile/tech_profile.go b/pkg/techprofile/tech_profile.go
index c8f2aa3..6ffbea8 100644
--- a/pkg/techprofile/tech_profile.go
+++ b/pkg/techprofile/tech_profile.go
@@ -22,9 +22,9 @@
 	"fmt"
 	"strconv"
 
-	"github.com/opencord/voltha-lib-go/pkg/db/kvstore"
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
-	"github.com/opencord/voltha-lib-go/pkg/log"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/v2/pkg/log"
 	tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
 )
 
diff --git a/pkg/techprofile/tech_profile_if.go b/pkg/techprofile/tech_profile_if.go
index de2fca4..0d7cc6a 100644
--- a/pkg/techprofile/tech_profile_if.go
+++ b/pkg/techprofile/tech_profile_if.go
@@ -17,7 +17,7 @@
 package techprofile
 
 import (
-	"github.com/opencord/voltha-lib-go/pkg/db/model"
+	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
 	tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
 )