diff --git a/tools/build/bazel/variables.bzl b/tools/build/bazel/variables.bzl
index 90a7479..43ad1ea 100644
--- a/tools/build/bazel/variables.bzl
+++ b/tools/build/bazel/variables.bzl
@@ -1,4 +1,4 @@
-ONOS_VERSION = "2.1.0-SNAPSHOT"
+ONOS_VERSION = "2.1.0-rc1"
 ONOS_ARTIFACT_BASE = "onos-"
 ONOS_GROUP_ID = "org.onosproject"
 ONOS_ORIGIN = "ONOS Community"
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 811921b..80b74a1 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -18,8 +18,8 @@
 export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)}
 
 # ONOS Version and onos.tar.gz staging environment
-export ONOS_POM_VERSION="2.1.0-SNAPSHOT"
-export ONOS_VERSION=${ONOS_VERSION:-2.1.0.$BUILD_NUMBER}
+export ONOS_POM_VERSION="2.1.0-rc1"
+export ONOS_VERSION=${ONOS_VERSION:-2.1.0-rc1.$BUILD_NUMBER}
 
 # ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment
 export ONOS_BITS=onos-${ONOS_VERSION%~*}
diff --git a/tools/build/onos-prepare-sonar b/tools/build/onos-prepare-sonar
index 1520d9c..4379452 100755
--- a/tools/build/onos-prepare-sonar
+++ b/tools/build/onos-prepare-sonar
@@ -253,7 +253,7 @@
     with open(bazel_vars_path, 'r') as bazel_vars_file:
         for bazel_var in bazel_vars_file.readlines():
             if "ONOS_VERSION" in bazel_var:
-                return bazel_var.replace(" ", "").replace('ONOS_VERSION="', '').replace('"', '')
+                return bazel_var.replace(" ", "").replace('ONOS_VERSION='2.1.0-rc1'
 
 
 def _main():