diff --git a/pkg/adapters/adapterif/adapter_proxy_if.go b/pkg/adapters/adapterif/adapter_proxy_if.go
index 26b1448..8197170 100644
--- a/pkg/adapters/adapterif/adapter_proxy_if.go
+++ b/pkg/adapters/adapterif/adapter_proxy_if.go
@@ -20,7 +20,7 @@
 	"context"
 
 	"github.com/golang/protobuf/proto"
-	ic "github.com/opencord/voltha-protos/go/inter_container"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
 )
 
 // AdapterProxy interface for AdapterProxy implementation.
diff --git a/pkg/adapters/adapterif/core_proxy_if.go b/pkg/adapters/adapterif/core_proxy_if.go
index 615452c..9286c0d 100644
--- a/pkg/adapters/adapterif/core_proxy_if.go
+++ b/pkg/adapters/adapterif/core_proxy_if.go
@@ -19,7 +19,7 @@
 import (
 	"context"
 
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 )
 
 // CoreProxy interface for voltha-go coreproxy.
diff --git a/pkg/adapters/adapterif/events_proxy_if.go b/pkg/adapters/adapterif/events_proxy_if.go
index 1f70f27..b8ea9d8 100644
--- a/pkg/adapters/adapterif/events_proxy_if.go
+++ b/pkg/adapters/adapterif/events_proxy_if.go
@@ -17,7 +17,7 @@
 package adapterif
 
 import (
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 )
 
 // EventProxy interface for eventproxy
diff --git a/pkg/adapters/common/adapter_proxy.go b/pkg/adapters/common/adapter_proxy.go
index ebef281..7b09a1f 100644
--- a/pkg/adapters/common/adapter_proxy.go
+++ b/pkg/adapters/common/adapter_proxy.go
@@ -23,7 +23,7 @@
 	"github.com/google/uuid"
 	"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"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
 	"time"
 )
 
diff --git a/pkg/adapters/common/core_proxy.go b/pkg/adapters/common/core_proxy.go
index 18e454f..b0f7f32 100644
--- a/pkg/adapters/common/core_proxy.go
+++ b/pkg/adapters/common/core_proxy.go
@@ -21,8 +21,8 @@
 	a "github.com/golang/protobuf/ptypes/any"
 	"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"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"sync"
diff --git a/pkg/adapters/common/events_proxy.go b/pkg/adapters/common/events_proxy.go
index 4f92296..ab6b0d0 100644
--- a/pkg/adapters/common/events_proxy.go
+++ b/pkg/adapters/common/events_proxy.go
@@ -26,7 +26,7 @@
 	"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"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 )
 
 type EventProxy struct {
diff --git a/pkg/adapters/common/performance_metrics.go b/pkg/adapters/common/performance_metrics.go
index 8f74439..bcb45f8 100644
--- a/pkg/adapters/common/performance_metrics.go
+++ b/pkg/adapters/common/performance_metrics.go
@@ -17,7 +17,7 @@
 package common
 
 import (
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 )
 
 type PmMetrics struct {
diff --git a/pkg/adapters/common/request_handler.go b/pkg/adapters/common/request_handler.go
index 3a51996..dfcaf1e 100644
--- a/pkg/adapters/common/request_handler.go
+++ b/pkg/adapters/common/request_handler.go
@@ -23,9 +23,9 @@
 	"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"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+	"github.com/opencord/voltha-protos/v2/go/openflow_13"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
diff --git a/pkg/adapters/iAdapter.go b/pkg/adapters/iAdapter.go
index 82fa644..be98f17 100644
--- a/pkg/adapters/iAdapter.go
+++ b/pkg/adapters/iAdapter.go
@@ -16,9 +16,9 @@
 package adapters
 
 import (
-	ic "github.com/opencord/voltha-protos/go/inter_container"
-	"github.com/opencord/voltha-protos/go/openflow_13"
-	"github.com/opencord/voltha-protos/go/voltha"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+	"github.com/opencord/voltha-protos/v2/go/openflow_13"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 )
 
 //IAdapter represents the set of APIs a voltha adapter has to support.
diff --git a/pkg/db/model/base_test.go b/pkg/db/model/base_test.go
index 4f44e45..34e6426 100644
--- a/pkg/db/model/base_test.go
+++ b/pkg/db/model/base_test.go
@@ -17,7 +17,7 @@
 
 import (
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"runtime/debug"
 	"sync"
 )
diff --git a/pkg/db/model/child_type.go b/pkg/db/model/child_type.go
index 016d7a2..5928192 100644
--- a/pkg/db/model/child_type.go
+++ b/pkg/db/model/child_type.go
@@ -21,7 +21,7 @@
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/go/common"
+	"github.com/opencord/voltha-protos/v2/go/common"
 	"reflect"
 	"strconv"
 	"sync"
diff --git a/pkg/db/model/child_type_test.go b/pkg/db/model/child_type_test.go
index 4725975..3836858 100644
--- a/pkg/db/model/child_type_test.go
+++ b/pkg/db/model/child_type_test.go
@@ -16,7 +16,7 @@
 package model
 
 import (
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"reflect"
 	"testing"
 )
diff --git a/pkg/db/model/event_bus.go b/pkg/db/model/event_bus.go
index a7bd040..d0a21f1 100644
--- a/pkg/db/model/event_bus.go
+++ b/pkg/db/model/event_bus.go
@@ -20,7 +20,7 @@
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 )
 
 // EventBus contains the details required to communicate with the event bus mechanism
diff --git a/pkg/db/model/event_bus_client.go b/pkg/db/model/event_bus_client.go
index b9c6431..d9a8d49 100644
--- a/pkg/db/model/event_bus_client.go
+++ b/pkg/db/model/event_bus_client.go
@@ -18,7 +18,7 @@
 
 import (
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 )
 
 // EventBusClient is an abstraction layer structure to communicate with an event bus mechanism
diff --git a/pkg/db/model/node_test.go b/pkg/db/model/node_test.go
index 240e918..7e0a3ce 100644
--- a/pkg/db/model/node_test.go
+++ b/pkg/db/model/node_test.go
@@ -19,9 +19,9 @@
 	"crypto/md5"
 	"fmt"
 	"github.com/golang/protobuf/ptypes/any"
-	"github.com/opencord/voltha-protos/go/common"
-	"github.com/opencord/voltha-protos/go/openflow_13"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"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"
 	"reflect"
 	"testing"
 )
diff --git a/pkg/db/model/proxy_load_test.go b/pkg/db/model/proxy_load_test.go
index 9a3d1a2..f28a727 100644
--- a/pkg/db/model/proxy_load_test.go
+++ b/pkg/db/model/proxy_load_test.go
@@ -20,9 +20,9 @@
 	"encoding/hex"
 	"github.com/google/uuid"
 	"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"
+	"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"
 	"math/rand"
 	"reflect"
 	"strconv"
diff --git a/pkg/db/model/proxy_test.go b/pkg/db/model/proxy_test.go
index 3f65997..785c65b 100644
--- a/pkg/db/model/proxy_test.go
+++ b/pkg/db/model/proxy_test.go
@@ -21,9 +21,9 @@
 	"encoding/json"
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-protos/go/common"
-	"github.com/opencord/voltha-protos/go/openflow_13"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"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"
 	"math/rand"
 	"reflect"
 	"strconv"
diff --git a/pkg/db/model/transaction_test.go b/pkg/db/model/transaction_test.go
index 3660a86..c33e5be 100644
--- a/pkg/db/model/transaction_test.go
+++ b/pkg/db/model/transaction_test.go
@@ -20,8 +20,8 @@
 	"context"
 	"encoding/hex"
 	"github.com/google/uuid"
-	"github.com/opencord/voltha-protos/go/common"
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/common"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 	"strconv"
 	"testing"
 )
diff --git a/pkg/flows/flow_utils.go b/pkg/flows/flow_utils.go
index aeecc03..f7d1b43 100644
--- a/pkg/flows/flow_utils.go
+++ b/pkg/flows/flow_utils.go
@@ -22,7 +22,7 @@
 	"github.com/cevaris/ordered_map"
 	"github.com/gogo/protobuf/proto"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	ofp "github.com/opencord/voltha-protos/go/openflow_13"
+	ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
 	"math/big"
 	"strings"
 )
diff --git a/pkg/flows/flow_utils_test.go b/pkg/flows/flow_utils_test.go
index cf6abf0..1721be7 100644
--- a/pkg/flows/flow_utils_test.go
+++ b/pkg/flows/flow_utils_test.go
@@ -17,7 +17,7 @@
 
 import (
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	ofp "github.com/opencord/voltha-protos/go/openflow_13"
+	ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/pkg/kafka/client.go b/pkg/kafka/client.go
index 36c1ede..007aa74 100755
--- a/pkg/kafka/client.go
+++ b/pkg/kafka/client.go
@@ -18,7 +18,7 @@
 import (
 	"time"
 
-	ca "github.com/opencord/voltha-protos/go/inter_container"
+	ca "github.com/opencord/voltha-protos/v2/go/inter_container"
 )
 
 const (
diff --git a/pkg/kafka/kafka_inter_container_library.go b/pkg/kafka/kafka_inter_container_library.go
index e265928..c576bc6 100644
--- a/pkg/kafka/kafka_inter_container_library.go
+++ b/pkg/kafka/kafka_inter_container_library.go
@@ -24,7 +24,7 @@
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/google/uuid"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	ic "github.com/opencord/voltha-protos/go/inter_container"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
 	"reflect"
 	"strings"
 	"sync"
diff --git a/pkg/kafka/sarama_client.go b/pkg/kafka/sarama_client.go
index 854b3e2..fc75026 100755
--- a/pkg/kafka/sarama_client.go
+++ b/pkg/kafka/sarama_client.go
@@ -23,7 +23,7 @@
 	"github.com/golang/protobuf/proto"
 	"github.com/google/uuid"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	ic "github.com/opencord/voltha-protos/go/inter_container"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
 	"strings"
 	"sync"
 	"time"
diff --git a/pkg/pmmetrics/performance_metrics.go b/pkg/pmmetrics/performance_metrics.go
index 4bd0446..8951a7d 100644
--- a/pkg/pmmetrics/performance_metrics.go
+++ b/pkg/pmmetrics/performance_metrics.go
@@ -17,7 +17,7 @@
 package pmmetrics
 
 import (
-	"github.com/opencord/voltha-protos/go/voltha"
+	"github.com/opencord/voltha-protos/v2/go/voltha"
 )
 
 // PmMetrics structure holds metric and device info
diff --git a/pkg/techprofile/tech_profile.go b/pkg/techprofile/tech_profile.go
index 6ffbea8..ea7b36a 100644
--- a/pkg/techprofile/tech_profile.go
+++ b/pkg/techprofile/tech_profile.go
@@ -25,7 +25,7 @@
 	"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"
+	tp_pb "github.com/opencord/voltha-protos/v2/go/tech_profile"
 )
 
 // Interface to pon resource manager APIs
diff --git a/pkg/techprofile/tech_profile_if.go b/pkg/techprofile/tech_profile_if.go
index 0d7cc6a..0904d7e 100644
--- a/pkg/techprofile/tech_profile_if.go
+++ b/pkg/techprofile/tech_profile_if.go
@@ -18,7 +18,7 @@
 
 import (
 	"github.com/opencord/voltha-lib-go/v2/pkg/db/model"
-	tp_pb "github.com/opencord/voltha-protos/go/tech_profile"
+	tp_pb "github.com/opencord/voltha-protos/v2/go/tech_profile"
 )
 
 type TechProfileIf interface {