diff --git a/tools/build/onos-change-version b/tools/build/onos-change-version
index 4845a34..89d1dda 100755
--- a/tools/build/onos-change-version
+++ b/tools/build/onos-change-version
@@ -39,9 +39,6 @@
 # Fix the onos-build-conf version
 sed -i".VERBACK" -E "s/<onos-build-conf.version>.*<\/onos-build-conf.version>/<onos-build-conf.version>$NEW_VERSION<\/onos-build-conf.version>/g" $ONOS_ROOT/lib/pom.xml
 
-# Version the BUCK artifacts
-sed -i".VERBACK" -E "s/ONOS_VERSION=.*/ONOS_VERSION='$NEW_VERSION'/" tools/build/onos-prepare-sonar
-
 # Version the bazel artifacts
 sed -i".VERBACK" -E "s/ONOS_VERSION.*/ONOS_VERSION = \"$NEW_VERSION\"/" tools/build/bazel/variables.bzl
 
diff --git a/tools/build/onos-prepare-sonar b/tools/build/onos-prepare-sonar
index 293f5e9..1520d9c 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='2.1.0-SNAPSHOT'
+                return bazel_var.replace(" ", "").replace('ONOS_VERSION="', '').replace('"', '')
 
 
 def _main():