diff --git a/tools/build/onos-upload-docs b/tools/build/onos-upload-docs
index ed9c0f5..ef39330 100755
--- a/tools/build/onos-upload-docs
+++ b/tools/build/onos-upload-docs
@@ -11,10 +11,10 @@
 user=${1:-${WIKI_USER:-$USER}}
 remote=$user@api.onosproject.org
 
-docs=$(onos-buck build //docs:external --show-output 2>/dev/null | tail -1 | cut -d\  -f2)
+docs="bazel-bin/docs/external.jar"
 
 ONOS_VERSION_STRING=$ONOS_VERSION
-if echo $ONOS_VERSION_STRING | grep '-b'; then
+if echo $ONOS_VERSION_STRING | grep -- '-b'; then
     echo "ONOS version $ONOS_VERSION_STRING is a beta. Skipping"
     exit 0
 fi
@@ -32,7 +32,7 @@
     replace="0"
 fi
 
-if echo $ONOS_VERSION_STRING | grep '-'; then
+if echo $ONOS_VERSION_STRING | grep -- '-'; then
     echo "ONOS version $ONOS_VERSION_STRING is a beta or RC. Not replacing default document set."
     replace="0"
 fi