Starting snapshot 1.8.0-SNAPSHOT
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 16d7e41..8aa45bd 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.8.0-rc3"
-export ONOS_VERSION=${ONOS_VERSION:-1.8.0-rc3.$BUILD_NUMBER}
+export ONOS_POM_VERSION="1.8.0-SNAPSHOT"
+export ONOS_VERSION=${ONOS_VERSION:-1.8.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 507a304..bb2592b 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.8.0-rc3'
+ONOS_VERSION='1.8.0-SNAPSHOT'
 
 # SonarQube property file name and template
 FILE_NAME = 'sonar-project.properties'