diff --git a/tools/build/onos-release b/tools/build/onos-release
index 83d4506..ae638fa 100755
--- a/tools/build/onos-release
+++ b/tools/build/onos-release
@@ -22,8 +22,6 @@
 
 cd $ONOS_ROOT
 
-# TODO: Create a new branch for this activity?
-
 # Change the version
 onos-change-version $NEW_VERSION
 export ONOS_VERSION=$NEW_VERSION
@@ -32,31 +30,29 @@
 onos-validate-change-version
 
 # Build ONOS & deploy to staging repo using the release profile.
-onos-buck build onos
-
-if [ $dryRun -eq 0 ]; then
-    time onos-buck-publish
-else
-    time onos-buck-publish-local
-fi
+bazel build onos
 
 # Build ONOS docs
-onos-buck build //docs:internal //docs:external
+bazel build //docs:internal //docs:external
 
-# Package test tar.gz
-onos-buck build //:onos-test
+if [ $dryRun -eq 0 ]; then
+    publish_url="oss.sonatype.org"
+else
+    publish_url=""
+fi
 
-# Package admin tar.gz
-onos-buck build //:onos-admin
+# Create artifact catalog
+onos-publish-catalog publishing-catalog
+
+# publish artifacts
+onos-upload-artifacts.py publishing-catalog ${publish_url}
 
 # Build ONOS archetypes & deploy to staging repo using the release profile.
 # Note that release of the staging repository is a separate manual step.
 if [ $dryRun -eq 0 ]; then
-    export MVN_CLI_OPTS=-Pstaging
     pushd tools/package/archetypes/
-    mvn -B -Pstaging clean install && onos-archetypes-test && mvn -Pstaging -Prelease clean deploy
+    mvn -B -Pstaging clean install && onos-archetypes-test -Pstaging && mvn -Pstaging -Prelease clean deploy
     popd
-    unset MVN_CLI_OPTS
 else
     pushd tools/package/archetypes/
     mvn -B clean install && onos-archetypes-test
@@ -68,5 +64,3 @@
     git commit -a -m"Tagging $NEW_VERSION"
     git tag -sm"Tagging $NEW_VERSION" $NEW_VERSION #signed tag
 fi
-
-# TODO: push?