diff --git a/internal/pkg/afrouter/affinity-router_test.go b/internal/pkg/afrouter/affinity-router_test.go
index 8a34575..3db4be2 100644
--- a/internal/pkg/afrouter/affinity-router_test.go
+++ b/internal/pkg/afrouter/affinity-router_test.go
@@ -19,8 +19,8 @@
 import (
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	common_pb "github.com/opencord/voltha-protos/go/common"
-	voltha_pb "github.com/opencord/voltha-protos/go/voltha"
+	common_pb "github.com/opencord/voltha-protos/v2/go/common"
+	voltha_pb "github.com/opencord/voltha-protos/v2/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"testing"
diff --git a/internal/pkg/afrouter/api.go b/internal/pkg/afrouter/api.go
index 1d07ed3..beb411b 100644
--- a/internal/pkg/afrouter/api.go
+++ b/internal/pkg/afrouter/api.go
@@ -20,8 +20,8 @@
 	"errors"
 	"fmt"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	pb "github.com/opencord/voltha-protos/go/afrouter"
-	common_pb "github.com/opencord/voltha-protos/go/common"
+	pb "github.com/opencord/voltha-protos/v2/go/afrouter"
+	common_pb "github.com/opencord/voltha-protos/v2/go/common"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"net"
diff --git a/internal/pkg/afrouter/binding-router_test.go b/internal/pkg/afrouter/binding-router_test.go
index c5851dd..08be2ae 100644
--- a/internal/pkg/afrouter/binding-router_test.go
+++ b/internal/pkg/afrouter/binding-router_test.go
@@ -20,7 +20,7 @@
 	"context"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	voltha_pb "github.com/opencord/voltha-protos/go/voltha"
+	voltha_pb "github.com/opencord/voltha-protos/v2/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/internal/pkg/afrouter/common_test.go b/internal/pkg/afrouter/common_test.go
index 4e561b2..180c01f 100644
--- a/internal/pkg/afrouter/common_test.go
+++ b/internal/pkg/afrouter/common_test.go
@@ -26,7 +26,7 @@
 )
 
 const (
-	TEST_PROTOFILE = "../../../vendor/github.com/opencord/voltha-protos/voltha.pb"
+	TEST_PROTOFILE = "../../../vendor/github.com/opencord/voltha-protos/v2/voltha.pb"
 
 	/*
 	 * This sets the LogLevel of the Voltha logger. It's pinned to FatalLevel here, as we
diff --git a/internal/pkg/afrouter/method-router_test.go b/internal/pkg/afrouter/method-router_test.go
index fd0285a..3f7d12c 100644
--- a/internal/pkg/afrouter/method-router_test.go
+++ b/internal/pkg/afrouter/method-router_test.go
@@ -19,8 +19,8 @@
 import (
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	common_pb "github.com/opencord/voltha-protos/go/common"
-	voltha_pb "github.com/opencord/voltha-protos/go/voltha"
+	common_pb "github.com/opencord/voltha-protos/v2/go/common"
+	voltha_pb "github.com/opencord/voltha-protos/v2/go/voltha"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"testing"
diff --git a/internal/pkg/afrouter/round-robin-router_test.go b/internal/pkg/afrouter/round-robin-router_test.go
index d38defc..1b05067 100644
--- a/internal/pkg/afrouter/round-robin-router_test.go
+++ b/internal/pkg/afrouter/round-robin-router_test.go
@@ -19,7 +19,7 @@
 import (
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	common_pb "github.com/opencord/voltha-protos/go/common"
+	common_pb "github.com/opencord/voltha-protos/v2/go/common"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"testing"
diff --git a/internal/pkg/afrouter/source-router_test.go b/internal/pkg/afrouter/source-router_test.go
index 9810ace..08e3112 100644
--- a/internal/pkg/afrouter/source-router_test.go
+++ b/internal/pkg/afrouter/source-router_test.go
@@ -18,7 +18,7 @@
 
 import (
 	"github.com/golang/protobuf/proto"
-	common_pb "github.com/opencord/voltha-protos/go/common"
+	common_pb "github.com/opencord/voltha-protos/v2/go/common"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
diff --git a/internal/pkg/afrouterd/coreMonitor.go b/internal/pkg/afrouterd/coreMonitor.go
index ac695a1..2bb007b 100644
--- a/internal/pkg/afrouterd/coreMonitor.go
+++ b/internal/pkg/afrouterd/coreMonitor.go
@@ -20,9 +20,9 @@
 	"fmt"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	pb "github.com/opencord/voltha-protos/go/afrouter"
-	cmn "github.com/opencord/voltha-protos/go/common"
-	vpb "github.com/opencord/voltha-protos/go/voltha"
+	pb "github.com/opencord/voltha-protos/v2/go/afrouter"
+	cmn "github.com/opencord/voltha-protos/v2/go/common"
+	vpb "github.com/opencord/voltha-protos/v2/go/voltha"
 	"golang.org/x/net/context"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/pkg/afrouterd/discoveryMonitor.go b/internal/pkg/afrouterd/discoveryMonitor.go
index bbead64..679d3f7 100644
--- a/internal/pkg/afrouterd/discoveryMonitor.go
+++ b/internal/pkg/afrouterd/discoveryMonitor.go
@@ -21,8 +21,8 @@
 	"github.com/golang/protobuf/ptypes"
 	"github.com/opencord/voltha-lib-go/v2/pkg/kafka"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	pb "github.com/opencord/voltha-protos/go/afrouter"
-	ic "github.com/opencord/voltha-protos/go/inter_container"
+	pb "github.com/opencord/voltha-protos/v2/go/afrouter"
+	ic "github.com/opencord/voltha-protos/v2/go/inter_container"
 	"golang.org/x/net/context"
 	"regexp"
 	"time"
diff --git a/internal/pkg/afrouterd/misc.go b/internal/pkg/afrouterd/misc.go
index bb9c1cb..7946205 100644
--- a/internal/pkg/afrouterd/misc.go
+++ b/internal/pkg/afrouterd/misc.go
@@ -19,7 +19,7 @@
 import (
 	"fmt"
 	"github.com/opencord/voltha-lib-go/v2/pkg/log"
-	pb "github.com/opencord/voltha-protos/go/afrouter"
+	pb "github.com/opencord/voltha-protos/v2/go/afrouter"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"