diff --git a/tools/build/bazel/variables.bzl b/tools/build/bazel/variables.bzl
index 1aba667..ca2147a 100644
--- a/tools/build/bazel/variables.bzl
+++ b/tools/build/bazel/variables.bzl
@@ -1,6 +1,6 @@
-ONOS_ORIGIN = "ONOS Community"
-ONOS_GROUP_ID = "org.onosproject"
-ONOS_VERSION = "1.15.0-SNAPSHOT"
-DEFAULT_APP_CATEGORY = "Utility"
+ONOS_VERSION = "2.0.0-SNAPSHOT"
 ONOS_ARTIFACT_BASE = "onos-"
+ONOS_GROUP_ID = "org.onosproject"
+ONOS_ORIGIN = "ONOS Community"
 APP_PREFIX = ONOS_GROUP_ID + "."
+DEFAULT_APP_CATEGORY = "Utility"
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 5b7880a..2f2f964 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="1.15.0-SNAPSHOT"
-export ONOS_VERSION=${ONOS_VERSION:-1.15.0.$BUILD_NUMBER}
+export ONOS_POM_VERSION="2.0.0-SNAPSHOT"
+export ONOS_VERSION=${ONOS_VERSION:-2.0.0.$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 75946ab..1798fda 100755
--- a/tools/build/onos-prepare-sonar
+++ b/tools/build/onos-prepare-sonar
@@ -12,7 +12,7 @@
 from subprocess import call, check_call, check_output
 
 # FIXME pull the version from the Buck version file
-ONOS_VERSION='1.15.0-SNAPSHOT'
+ONOS_VERSION='2.0.0-SNAPSHOT'
 
 # SonarQube property file name and template
 FILE_NAME = 'sonar-project.properties'