Update pods and publish script to use trunk

self-merge