diff --git a/tests/afrouter/suites/test1/test1.json b/tests/afrouter/suites/test1/test1.json
index 444719c..14be12c 100644
--- a/tests/afrouter/suites/test1/test1.json
+++ b/tests/afrouter/suites/test1/test1.json
@@ -3,25 +3,25 @@
 		"cmdLine":"afrouter -logLevel 1 -config arouter_test.json",
 		"protoFiles": [
 			{
-				"importPath":"github.com/opencord/voltha-protos/v2/go/",
+				"importPath":"github.com/opencord/voltha-protos/v3/go/",
 				"service":"VolthaService",
 				"package":"voltha"
 			},
 			{
-				"importPath":"github.com/opencord/voltha-protos/v2/go/",
+				"importPath":"github.com/opencord/voltha-protos/v3/go/",
 				"service":"Configuration",
 				"package":"afrouter"
 			}
 		],
 		"Junk": [
 			{
-				"importPath":"github.com/opencord/voltha-protos/v2/go/",
+				"importPath":"github.com/opencord/voltha-protos/v3/go/",
 				"service":"Configuration",
 				"package":"afrouter"
 			}
 		],
 		"imports": [
-			"github.com/opencord/voltha-protos/v2/go/common"
+			"github.com/opencord/voltha-protos/v3/go/common"
 		],
 		"protoDesc":"voltha.pb",
 		"protoSubst": [
@@ -33,8 +33,8 @@
 		"clients": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/v2/go/openflow_13",
-				"github.com/opencord/voltha-protos/v2/go/common"
+				"github.com/opencord/voltha-protos/v3/go/openflow_13",
+				"github.com/opencord/voltha-protos/v3/go/common"
 			],
 			"endpoints": [
 				{
@@ -50,9 +50,9 @@
 		"servers": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/v2/go/openflow_13",
-				"github.com/opencord/voltha-protos/v2/go/common",
-				"github.com/opencord/voltha-protos/v2/go/omci"
+				"github.com/opencord/voltha-protos/v3/go/openflow_13",
+				"github.com/opencord/voltha-protos/v3/go/common",
+				"github.com/opencord/voltha-protos/v3/go/omci"
 			],
 			"endpoints": [
 			{
diff --git a/tests/afrouter/suites/test2/test2.go b/tests/afrouter/suites/test2/test2.go
index 6bf545b..68ce93c 100644
--- a/tests/afrouter/suites/test2/test2.go
+++ b/tests/afrouter/suites/test2/test2.go
@@ -31,7 +31,7 @@
 	//"encoding/json"
 	"text/template"
 	//"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 	//pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
 )
 
diff --git a/tests/afrouter/suites/test2/test2.tmpl.json b/tests/afrouter/suites/test2/test2.tmpl.json
index afa0962..34ea334 100644
--- a/tests/afrouter/suites/test2/test2.tmpl.json
+++ b/tests/afrouter/suites/test2/test2.tmpl.json
@@ -3,19 +3,19 @@
 		"cmdLine":"afrouter -config arouter_test.json -logLevel 1",
 		"protoFiles": [
 			{
-				"importPath":"github.com/opencord/voltha-protos/v2/go/",
+				"importPath":"github.com/opencord/voltha-protos/v3/go/",
 				"service":"VolthaService",
 				"package":"voltha"
 			},
 			{
-				"importPath":"github.com/opencord/voltha-protos/v2/go/",
+				"importPath":"github.com/opencord/voltha-protos/v3/go/",
 				"service":"Configuration",
 				"package":"afrouter"
 			}
 		],
 		"imports": [
 			"github.com/golang/protobuf/ptypes/empty",
-			"github.com/opencord/voltha-protos/v2/go/common"
+			"github.com/opencord/voltha-protos/v3/go/common"
 		],
 		"protoDesc":"voltha.pb",
 		"protoSubst": [
@@ -27,8 +27,8 @@
 		"clients": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/v2/go/openflow_13",
-				"github.com/opencord/voltha-protos/v2/go/common"
+				"github.com/opencord/voltha-protos/v3/go/openflow_13",
+				"github.com/opencord/voltha-protos/v3/go/common"
 			],
 			"endpoints": [
 				{
@@ -44,9 +44,9 @@
 		"servers": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/v2/go/openflow_13",
-				"github.com/opencord/voltha-protos/v2/go/omci",
-				"github.com/opencord/voltha-protos/v2/go/common"
+				"github.com/opencord/voltha-protos/v3/go/openflow_13",
+				"github.com/opencord/voltha-protos/v3/go/omci",
+				"github.com/opencord/voltha-protos/v3/go/common"
 			],
 			"endpoints": [
 			{
diff --git a/tests/afrouter/suites/test3/test3.go b/tests/afrouter/suites/test3/test3.go
index 79ea6c1..956152b 100644
--- a/tests/afrouter/suites/test3/test3.go
+++ b/tests/afrouter/suites/test3/test3.go
@@ -31,7 +31,7 @@
 	//"encoding/json"
 	"text/template"
 	//"github.com/golang/protobuf/proto"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 	//pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
 )
 
diff --git a/tests/afrouter/suites/test3/test3.tmpl.json b/tests/afrouter/suites/test3/test3.tmpl.json
index 953031b..75d678b 100644
--- a/tests/afrouter/suites/test3/test3.tmpl.json
+++ b/tests/afrouter/suites/test3/test3.tmpl.json
@@ -3,20 +3,20 @@
 		"cmdLine":"afrouter -config arouter_test.json -logLevel 1",
 		"protoFiles": [
 			{
-				"importPath":"github.com/opencord/voltha-protos/v2/go/",
+				"importPath":"github.com/opencord/voltha-protos/v3/go/",
 				"service":"VolthaService",
 				"package":"voltha"
 			},
 			{
-				"importPath":"github.com/opencord/voltha-protos/v2/go/",
+				"importPath":"github.com/opencord/voltha-protos/v3/go/",
 				"service":"Configuration",
 				"package":"afrouter"
 			}
 		],
 		"imports": [
 			"github.com/golang/protobuf/ptypes/empty",
-			"github.com/opencord/voltha-protos/v2/go/openflow_13",
-			"github.com/opencord/voltha-protos/v2/go/common"
+			"github.com/opencord/voltha-protos/v3/go/openflow_13",
+			"github.com/opencord/voltha-protos/v3/go/common"
 		],
 		"protoDesc":"voltha.pb",
 		"protoSubst": [
@@ -28,8 +28,8 @@
 		"clients": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/v2/go/openflow_13",
-				"github.com/opencord/voltha-protos/v2/go/common"
+				"github.com/opencord/voltha-protos/v3/go/openflow_13",
+				"github.com/opencord/voltha-protos/v3/go/common"
 			],
 			"endpoints": [
 				{
@@ -45,9 +45,9 @@
 		"servers": {
 			"imports": [
 				"github.com/golang/protobuf/ptypes/empty",
-				"github.com/opencord/voltha-protos/v2/go/openflow_13",
-				"github.com/opencord/voltha-protos/v2/go/omci",
-				"github.com/opencord/voltha-protos/v2/go/common"
+				"github.com/opencord/voltha-protos/v3/go/openflow_13",
+				"github.com/opencord/voltha-protos/v3/go/omci",
+				"github.com/opencord/voltha-protos/v3/go/common"
 			],
 			"endpoints": [
 			{
diff --git a/tests/afrouter/templates/client.go.tmpl b/tests/afrouter/templates/client.go.tmpl
index 8543040..79bad83 100644
--- a/tests/afrouter/templates/client.go.tmpl
+++ b/tests/afrouter/templates/client.go.tmpl
@@ -23,7 +23,7 @@
 	"google.golang.org/grpc"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 	// Values generated by the go template
 	{{range .Imports}}
 	"{{.}}"
diff --git a/tests/afrouter/templates/main.go.tmpl b/tests/afrouter/templates/main.go.tmpl
index 5293b06..f1bb3ed 100644
--- a/tests/afrouter/templates/main.go.tmpl
+++ b/tests/afrouter/templates/main.go.tmpl
@@ -27,7 +27,7 @@
 	"context"
 	//slog "log"
 	//"google.golang.org/grpc/grpclog"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 )
 
 func startSut(cmdStr string) (*exec.Cmd, context.CancelFunc, error) {
diff --git a/tests/afrouter/templates/runAll.go.tmpl b/tests/afrouter/templates/runAll.go.tmpl
index a0414a2..d270b68 100644
--- a/tests/afrouter/templates/runAll.go.tmpl
+++ b/tests/afrouter/templates/runAll.go.tmpl
@@ -25,7 +25,7 @@
 	"fmt"
 	"os/exec"
 	"io/ioutil"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 )
 
 
diff --git a/tests/afrouter/templates/runTests.go.tmpl b/tests/afrouter/templates/runTests.go.tmpl
index 5660739..62b938d 100644
--- a/tests/afrouter/templates/runTests.go.tmpl
+++ b/tests/afrouter/templates/runTests.go.tmpl
@@ -26,7 +26,7 @@
 	"encoding/json"
 	//"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 {{end}}
 	{{range .Imports}}
 	{{if .Used}}
diff --git a/tests/afrouter/templates/server.go.tmpl b/tests/afrouter/templates/server.go.tmpl
index 7ce70b0..0830b12 100644
--- a/tests/afrouter/templates/server.go.tmpl
+++ b/tests/afrouter/templates/server.go.tmpl
@@ -27,7 +27,7 @@
 	"google.golang.org/grpc"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 	// Values generated by the go template
 	{{range .Imports}}
 	"{{.}}"
diff --git a/tests/afrouter/templates/stats.go.tmpl b/tests/afrouter/templates/stats.go.tmpl
index 92c923c..3eb4008 100644
--- a/tests/afrouter/templates/stats.go.tmpl
+++ b/tests/afrouter/templates/stats.go.tmpl
@@ -26,7 +26,7 @@
 	"io/ioutil"
 	"encoding/json"
 	//"google.golang.org/grpc/grpclog"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 )
 
 type TestCase struct {
diff --git a/tests/afrouter/tester.go b/tests/afrouter/tester.go
index 0e57537..b6dcd3c 100644
--- a/tests/afrouter/tester.go
+++ b/tests/afrouter/tester.go
@@ -26,7 +26,7 @@
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 	"io/ioutil"
 	"math"
 	"os"
diff --git a/tests/afrouter/tester/main.go b/tests/afrouter/tester/main.go
index e7e63fa..b733efc 100644
--- a/tests/afrouter/tester/main.go
+++ b/tests/afrouter/tester/main.go
@@ -22,7 +22,7 @@
 package main
 
 import (
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
 )
 
 func main() {
diff --git a/tests/core/api/grpc_nbi_api_handler_client_test.go b/tests/core/api/grpc_nbi_api_handler_client_test.go
index 17ad4b9..16ee92b 100644
--- a/tests/core/api/grpc_nbi_api_handler_client_test.go
+++ b/tests/core/api/grpc_nbi_api_handler_client_test.go
@@ -28,11 +28,11 @@
 	"time"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/v2/go/common"
-	"github.com/opencord/voltha-protos/v2/go/openflow_13"
-	"github.com/opencord/voltha-protos/v2/go/voltha"
+	com "github.com/opencord/voltha-lib-go/v3/pkg/adapters/common"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
+	"github.com/opencord/voltha-protos/v3/go/common"
+	"github.com/opencord/voltha-protos/v3/go/openflow_13"
+	"github.com/opencord/voltha-protos/v3/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/tests/core/concurrency/core_concurrency_test.go b/tests/core/concurrency/core_concurrency_test.go
index c9ca8f1..c8ddff2 100644
--- a/tests/core/concurrency/core_concurrency_test.go
+++ b/tests/core/concurrency/core_concurrency_test.go
@@ -28,10 +28,10 @@
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/google/uuid"
-	com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/v2/go/common"
-	"github.com/opencord/voltha-protos/v2/go/voltha"
+	com "github.com/opencord/voltha-lib-go/v3/pkg/adapters/common"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
+	"github.com/opencord/voltha-protos/v3/go/common"
+	"github.com/opencord/voltha-protos/v3/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/tests/core/flow_management_test.go b/tests/core/flow_management_test.go
index 9c08e7a..dbd9ab7 100644
--- a/tests/core/flow_management_test.go
+++ b/tests/core/flow_management_test.go
@@ -23,10 +23,10 @@
 	"github.com/google/uuid"
 	fu "github.com/opencord/voltha-go/rw_core/utils"
 	tu "github.com/opencord/voltha-go/tests/utils"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/v2/go/common"
-	ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
-	"github.com/opencord/voltha-protos/v2/go/voltha"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
+	"github.com/opencord/voltha-protos/v3/go/common"
+	ofp "github.com/opencord/voltha-protos/v3/go/openflow_13"
+	"github.com/opencord/voltha-protos/v3/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/metadata"
 	"math"
diff --git a/tests/core/performance_metrics_test.go b/tests/core/performance_metrics_test.go
index f5867ad..6827068 100644
--- a/tests/core/performance_metrics_test.go
+++ b/tests/core/performance_metrics_test.go
@@ -22,9 +22,9 @@
 	"fmt"
 	"github.com/google/uuid"
 	tu "github.com/opencord/voltha-go/tests/utils"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/v2/go/common"
-	"github.com/opencord/voltha-protos/v2/go/voltha"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
+	"github.com/opencord/voltha-protos/v3/go/common"
+	"github.com/opencord/voltha-protos/v3/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/metadata"
 	"math"
diff --git a/tests/kafka/kafka_client_test.go b/tests/kafka/kafka_client_test.go
index 7309840..a553283 100644
--- a/tests/kafka/kafka_client_test.go
+++ b/tests/kafka/kafka_client_test.go
@@ -26,9 +26,9 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/google/uuid"
-	kk "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+	kk "github.com/opencord/voltha-lib-go/v3/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
+	ic "github.com/opencord/voltha-protos/v3/go/inter_container"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tests/kafka/kafka_inter_container_messaging_test.go b/tests/kafka/kafka_inter_container_messaging_test.go
index 7a7ce27..1a3521c 100644
--- a/tests/kafka/kafka_inter_container_messaging_test.go
+++ b/tests/kafka/kafka_inter_container_messaging_test.go
@@ -22,10 +22,10 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/google/uuid"
 	rhp "github.com/opencord/voltha-go/rw_core/core"
-	kk "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
-	"github.com/opencord/voltha-protos/v2/go/voltha"
+	kk "github.com/opencord/voltha-lib-go/v3/pkg/kafka"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
+	ic "github.com/opencord/voltha-protos/v3/go/inter_container"
+	"github.com/opencord/voltha-protos/v3/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
@@ -126,7 +126,7 @@
 //
 //func TestMultipleSubscribeUnsubscribe(t *testing.T) {
 //	// First subscribe to the specific topic
-//	//log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v2/pkg/kafka", log.DebugLevel)
+//	//log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v3/pkg/kafka", log.DebugLevel)
 //	var err error
 //	var ch1 <-chan *ic.InterContainerMessage
 //	var ch2 <-chan *ic.InterContainerMessage
@@ -165,7 +165,7 @@
 //}
 
 func TestIncorrectAPI(t *testing.T) {
-	log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v2/pkg/kafka", log.ErrorLevel)
+	log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v3/pkg/kafka", log.ErrorLevel)
 	trnsId := uuid.New().String()
 	protoMsg := &voltha.Device{Id: trnsId}
 	args := make([]*kk.KVArg, 1)
diff --git a/tests/utils/test_utils.go b/tests/utils/test_utils.go
index c461f7e..ffc6faa 100644
--- a/tests/utils/test_utils.go
+++ b/tests/utils/test_utils.go
@@ -27,11 +27,11 @@
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/google/uuid"
-	com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
-	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/v2/go/common"
-	ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
-	"github.com/opencord/voltha-protos/v2/go/voltha"
+	com "github.com/opencord/voltha-lib-go/v3/pkg/adapters/common"
+	"github.com/opencord/voltha-lib-go/v3/pkg/log"
+	"github.com/opencord/voltha-protos/v3/go/common"
+	ofp "github.com/opencord/voltha-protos/v3/go/openflow_13"
+	"github.com/opencord/voltha-protos/v3/go/voltha"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"