diff --git a/build_go_protos.sh b/build_go_protos.sh
index 7d3c1dd..f8046cc 100755
--- a/build_go_protos.sh
+++ b/build_go_protos.sh
@@ -26,7 +26,7 @@
 export MAPS=Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor
 export INCS="\
     -I $PARENT_DIR \
-    -I /usr/local/include/googleapis"
+    -I ${PARENT_DIR}/google/api"
 
 export VOLTHA_PB="\
     $SRC_DIR/adapter.proto \
@@ -48,6 +48,7 @@
 export OF_PB="$SRC_DIR/openflow_13.proto"
 export OMCI_PB="$SRC_DIR/omci*.proto"
 export AFROUTER_PB="$SRC_DIR/afrouter.proto"
+export OPENOLT_PB="$SRC_DIR/openolt.proto"
 
 export PB_VARS="\
     VOLTHA_PB \
@@ -58,9 +59,11 @@
     OF_PB \
     OMCI_PB \
     AFROUTER_PB \
-	OMCI_PB"
+    OMCI_PB \
+    OPENOLT_PB"
 
-export OTHER_INCLUDES="/usr/local/include/googleapis"
+
+export OTHER_INCLUDES="${PARENT_DIR}/google/api"
 export PROTO_DESC_FILE="go/voltha.pb"
 
 for pb_var in $PB_VARS
diff --git a/go/voltha.pb b/go/voltha.pb
index 84c9a71..273aee1 100644
--- a/go/voltha.pb
+++ b/go/voltha.pb
Binary files differ
diff --git a/protos/voltha_protos/openolt.proto b/protos/voltha_protos/openolt.proto
index ddc8f74..57ea9c2 100644
--- a/protos/voltha_protos/openolt.proto
+++ b/protos/voltha_protos/openolt.proto
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 syntax = "proto3";
+
+option go_package = "github.com/opencord/voltha-protos/go/openolt";
+
 package openolt;
 import "google/api/annotations.proto";