diff --git a/tools/build/onos-release b/tools/build/onos-release
index e714101..9d3603b 100755
--- a/tools/build/onos-release
+++ b/tools/build/onos-release
@@ -20,6 +20,11 @@
 onos-change-version $NEW_VERSION
 export ONOS_VERSION=$NEW_VERSION
 
+# Build the maven-plugin
+pushd tools/package/maven-plugin
+mvn clean install && mvn -Prelease clean deploy
+popd
+
 # Build ONOS & deploy to staging repo using the release profile.
 onos-build && onos-package && mvn -Prelease clean deploy -DskipTests
 
@@ -28,8 +33,9 @@
 
 # Build ONOS archetypes & deploy to staging repo using the release profile.
 # Note that release of the staging repository is a separate manual step.
-cd tools/package/archetypes/
+pushd tools/package/archetypes/
 mvn clean install && onos-archetypes-test && mvn -Prelease clean deploy
+popd
 
 # Commit newly versioned artifacts and issue a tag.
 git commit -a -m"Tagging $NEW_VERSION"