diff --git a/drivers/bmv2/pom.xml b/drivers/bmv2/pom.xml
index 7011cbcfd3..7336c701e6 100644
--- a/drivers/bmv2/pom.xml
+++ b/drivers/bmv2/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
-            <version>1.3.1</version>
+            <version>${grpccore.version}</version>
         </dependency>
 
         <dependency>
diff --git a/drivers/gnmi/pom.xml b/drivers/gnmi/pom.xml
index 7614d81742..7f0cf5412f 100644
--- a/drivers/gnmi/pom.xml
+++ b/drivers/gnmi/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
-            <version>1.3.1</version>
+            <version>${grpccore.version}</version>
         </dependency>
 
         <!-- protocols/gnmi/api missing -->
diff --git a/drivers/p4runtime/pom.xml b/drivers/p4runtime/pom.xml
index cc3afa379e..a122e7baa4 100644
--- a/drivers/p4runtime/pom.xml
+++ b/drivers/p4runtime/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
-            <version>1.3.1</version>
+            <version>${grpccore.version}</version>
         </dependency>
 
         <dependency>
diff --git a/lib/pom.xml b/lib/pom.xml
index 8ae2c4d512..ac93726a9c 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -503,6 +503,11 @@
                 <artifactId>onos-yang-serializers-json</artifactId>
                 <version>${onos-yang-tools.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-core</artifactId>
+                <version>${grpccore.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -713,12 +718,6 @@
             <artifactId>jsr305</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>io.grpc</groupId>
-            <artifactId>grpc-core</artifactId>
-            <version>${grpccore.version}</version>
-        </dependency>
-
     </dependencies>
 
     <build>
diff --git a/protocols/grpc/api/pom.xml b/protocols/grpc/api/pom.xml
index faae095105..3060b3f483 100644
--- a/protocols/grpc/api/pom.xml
+++ b/protocols/grpc/api/pom.xml
@@ -46,7 +46,7 @@
        <dependency>
            <groupId>io.grpc</groupId>
            <artifactId>grpc-stub</artifactId>
-           <version>1.3.1</version>
+           <version>${grpccore.version}</version>
        </dependency>
    </dependencies>
 
diff --git a/protocols/p4runtime/model/pom.xml b/protocols/p4runtime/model/pom.xml
index ffc4eb3d6f..30375ece79 100644
--- a/protocols/p4runtime/model/pom.xml
+++ b/protocols/p4runtime/model/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>
-            <version>1.3.1</version>
+            <version>${grpccore.version}</version>
         </dependency>
 
         <dependency>
diff --git a/protocols/p4runtime/pom.xml b/protocols/p4runtime/pom.xml
index f84bda8e36..157c1a863e 100644
--- a/protocols/p4runtime/pom.xml
+++ b/protocols/p4runtime/pom.xml
@@ -42,7 +42,6 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-core</artifactId>
-            <version>1.3.1</version>
         </dependency>
 
 
diff --git a/protocols/p4runtime/proto/pom.xml b/protocols/p4runtime/proto/pom.xml
index ceb73707b9..e55de9b162 100644
--- a/protocols/p4runtime/proto/pom.xml
+++ b/protocols/p4runtime/proto/pom.xml
@@ -178,24 +178,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--<plugin>-->
-                <!--<groupId>com.googlecode.maven-download-plugin</groupId>-->
-                <!--<artifactId>download-maven-plugin</artifactId>-->
-                <!--<version>1.3.1</version>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<id>install-any</id>-->
-                        <!--<phase>generate-resources</phase>-->
-                        <!--<goals>-->
-                            <!--<goal>wget</goal>-->
-                        <!--</goals>-->
-                        <!--<configuration>-->
-                            <!--<url>https://raw.githubusercontent.com/google/protobuf/master/src/google/protobuf/any.proto</url>-->
-                            <!--<outputDirectory>${project.basedir}/target/PI/proto/googleapis/google/protobuf</outputDirectory>-->
-                        <!--</configuration>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
 
         </plugins>
     </build>