diff --git a/tools/build/onos-buck-publish-local b/tools/build/onos-buck-publish-local
index d47f72d..6c52db7 100755
--- a/tools/build/onos-buck-publish-local
+++ b/tools/build/onos-buck-publish-local
@@ -3,21 +3,8 @@
 set -e
 onos-buck -V
 
-rm -f /tmp/publish.sh
-trap "rm -f /tmp/publish.sh /tmp/publish.sh.bak" EXIT
+for package in `cat ${ONOS_ROOT}/tools/build/publish-target-list ${ONOS_ROOT}/tools/build/publish-test-target-list | grep -v '#'`; do
+    onos-buck publish --to-local-repo ${package}
+done
 
 
-onos-buck query "kind('onos_jar', deps('//tools/package:onos-package'))" >> /tmp/publish.sh
-
-sed -i.bak 's/^/onos-buck publish --to-local-repo /g' /tmp/publish.sh
-
-bash /tmp/publish.sh
-
-rm /tmp/publish.sh
-rm /tmp/publish.sh.bak
-
-onos-buck query "testsof(kind('onos_jar', deps('//tools/package:onos-package')))" >> /tmp/publish.sh
-sed -i.bak 's#^#onos-buck publish --to-local-repo #g' /tmp/publish.sh
-
-bash /tmp/publish.sh
-rm /tmp/publish.sh.bak