diff --git a/tools/build/conf/pom.xml b/tools/build/conf/pom.xml
index 9227126..fd692b5 100644
--- a/tools/build/conf/pom.xml
+++ b/tools/build/conf/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-build-conf</artifactId>
-    <version>1.13.0-b8</version>
+    <version>1.13.0-SNAPSHOT</version>
     <description>Various ONOS build settings</description>
 
     <properties>
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index 30cf2c3..6137a27 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.13.0-b8"
-export ONOS_VERSION=${ONOS_VERSION:-1.13.0-b8.$BUILD_NUMBER}
+export ONOS_POM_VERSION="1.13.0-SNAPSHOT"
+export ONOS_VERSION=${ONOS_VERSION:-1.13.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 36a6cb2..49bbfc8 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.13.0-b8'
+ONOS_VERSION='1.13.0-SNAPSHOT'
 
 # SonarQube property file name and template
 FILE_NAME = 'sonar-project.properties'