diff --git a/tools/build/onos-prepare-release b/tools/build/onos-prepare-release
index 7d8f0db..ccf9152 100755
--- a/tools/build/onos-prepare-release
+++ b/tools/build/onos-prepare-release
@@ -26,7 +26,8 @@
 git checkout $BRANCH
 
 # Check existance of version
-git tag -l | grep -q $ONOS_VERSION && { echo "ERROR: Version already exists"; exit -1; }
+git tag -l | grep -q "$ONOS_VERSION\$" &&
+  { echo "ERROR: Version already exists"; exit -1; }
 
 export ONOS_ROOT=$DIR
 . $ONOS_ROOT/tools/build/envDefaults
diff --git a/tools/build/onos-release-prerequisites b/tools/build/onos-release-prerequisites
index dc7f098..38e69e8 100755
--- a/tools/build/onos-release-prerequisites
+++ b/tools/build/onos-release-prerequisites
@@ -39,7 +39,7 @@
     trap "echo 'FAILED'" ERR
     printf "Checking Java version... "
     v=$(javac -version 2>&1 | grep 1.8.0_ | sed -e 's/.*1.8.0_\([0-9]*\).*/\1/g')
-    test "$v" -ge 74
+    test "$v" -ge 73
     echo "OK"
 }
 
diff --git a/tools/build/onos-upload-docs b/tools/build/onos-upload-docs
index 18985e8..f498358 100755
--- a/tools/build/onos-upload-docs
+++ b/tools/build/onos-upload-docs
@@ -8,7 +8,7 @@
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults
 
-user=${1:-$USER}
+user=${1:-${WIKI_USER:-$USER}}
 remote=$user@wiki.onosproject.org
 
 scp $ONOS_ROOT/docs/target/onos-apidocs-$ONOS_VERSION.tar.gz $remote:/tmp