--- a/b2g/config/nexus-4-kk/config.json
+++ b/b2g/config/nexus-4-kk/config.json
@@ -12,17 +12,18 @@
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml"
     ],
     "public_upload_files": [
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml",
-        "{objdir}/dist/b2g-update/*.mar"
+        "{objdir}/dist/b2g-update/*.mar",
+        "{workdir}/mako.zip"
     ],
     "zip_files": [
         ["{workdir}/out/target/product/mako/*.img", "out/target/product/mako/"],
         ["{workdir}/boot.img", "out/target/product/mako/"],
         "{workdir}/flash.sh",
         "{workdir}/load-config.sh",
         "{workdir}/.config",
         "{workdir}/sources.xml",

--- a/b2g/config/nexus-5-l/config.json
+++ b/b2g/config/nexus-5-l/config.json
@@ -12,17 +12,18 @@
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml"
     ],
     "public_upload_files": [
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml",
-        "{objdir}/dist/b2g-update/*.mar"
+        "{objdir}/dist/b2g-update/*.mar",
+        "{workdir}/hammerhead.zip"
     ],
     "zip_files": [
         ["{workdir}/out/target/product/hammerhead/*.img", "out/target/product/hammerhead/"],
         ["{workdir}/boot.img", "out/target/product/hammerhead/"],
         "{workdir}/flash.sh",
         "{workdir}/load-config.sh",
         "{workdir}/.config",
         "{workdir}/sources.xml",

--- a/testing/taskcluster/scripts/phone-builder/post-build.sh
+++ b/testing/taskcluster/scripts/phone-builder/post-build.sh
@@ -12,16 +12,21 @@ mkdir -p $HOME/artifacts-public
 
 DEVICE=${TARGET%%-*}
 
 mv $WORKSPACE/B2G/upload/sources.xml $HOME/artifacts/sources.xml
 mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz $HOME/artifacts/b2g-android-arm.tar.gz
 mv $WORKSPACE/B2G/upload/${TARGET}.zip $HOME/artifacts/${TARGET}.zip
 mv $WORKSPACE/B2G/upload/gaia.zip $HOME/artifacts/gaia.zip
 
+# Upload public images as public artifacts on Nexus 4 KK and Nexus 5 L
+if [ "${TARGET}" = "nexus-4-kk" -o "${TARGET}" = "nexus-5-l" ]; then
+  mv $HOME/artifacts/${TARGET}.zip $HOME/artifacts-public/
+fi
+
 if [ -f $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip ]; then
   mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 fi
 
 if [ -f $WORKSPACE/B2G/upload-public/*.blobfree-dist.zip ]; then
   mv $WORKSPACE/B2G/upload-public/*.blobfree-dist.zip $HOME/artifacts-public/
 fi