diff --git a/b2g/config/otoro/config.json b/b2g/config/otoro/config.json
index c27804fc3ebdc395019c1983a035dac2b266f512..776ed5635c6c589b26debfc7965eafcee54e6657 100644
--- a/b2g/config/otoro/config.json
+++ b/b2g/config/otoro/config.json
@@ -6,14 +6,22 @@
     "mock_files": [["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"]],
     "build_targets": [],
     "upload_files": [
-        "{workdir}/out/target/product/otoro/*.img",
         "{objdir}/dist/b2g-update/*.mar",
         "{objdir}/dist/b2g-*.tar.gz",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{workdir}/sources.xml"
     ],
+    "zip_files": [
+        ["{workdir}/out/target/product/otoro/*.img", "out/target/product/otoro/"],
+        "{workdir}/boot.img",
+        "{workdir}/flash.sh",
+        "{workdir}/load-config.sh",
+        "{workdir}/.config",
+        "{workdir}/sources.xml"
+    ],
     "env": {
         "VARIANT": "user",
+        "MOZILLA_OFFICIAL": "1",
         "B2GUPDATER": "1"
     },
     "gaia": {
diff --git a/b2g/config/otoro/releng-otoro.tt b/b2g/config/otoro/releng-otoro.tt
index dd9993522b8df02533658dc133b953b0064a4c68..6a92d1ccc9c6ef387be418e6046437703092fbc1 100644
--- a/b2g/config/otoro/releng-otoro.tt
+++ b/b2g/config/otoro/releng-otoro.tt
@@ -4,5 +4,11 @@
 "digest": "0ccae39ee8910947fe3cf51fa3a45e820d2ff11571f6ccec29d9b3e5ae7f7709c1ad657210fbfea98baadd032c3d6a58e00ddbb2e93acafd751089869a72fed6",
 "algorithm": "sha512",
 "filename": "gonk.tar.xz"
+},
+{
+"size": 4139008,
+"digest": "b1eac90cebe52708d512bbc293c507da9d93bc8c6a78cbbbd78cc9b7beb2cd335bef9bf8e4bf5a9dc38521f7080d29a743626f9e4af6c42ec211db22dc9d0fda",
+"algorithm": "sha512",
+"filename": "boot.img"
 }
 ]
diff --git a/b2g/config/unagi/config.json b/b2g/config/unagi/config.json
index bd4b2bd451c740c307188edf4c1321273d6eea76..6b22ef682b8ece4a3d5730c76ada72162981154b 100644
--- a/b2g/config/unagi/config.json
+++ b/b2g/config/unagi/config.json
@@ -6,14 +6,22 @@
     "mock_files": [["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"]],
     "build_targets": [],
     "upload_files": [
-        "{workdir}/out/target/product/unagi/*.img",
         "{objdir}/dist/b2g-update/*.mar",
         "{objdir}/dist/b2g-*.tar.gz",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{workdir}/sources.xml"
     ],
+    "zip_files": [
+        ["{workdir}/out/target/product/unagi/*.img", "out/target/product/unagi/"],
+        "{workdir}/boot.img",
+        "{workdir}/flash.sh",
+        "{workdir}/load-config.sh",
+        "{workdir}/.config",
+        "{workdir}/sources.xml"
+    ],
     "env": {
         "VARIANT": "user",
+        "MOZILLA_OFFICIAL": "1",
         "B2GUPDATER": "1"
     },
     "gaia": {
diff --git a/b2g/config/unagi/releng-unagi.tt b/b2g/config/unagi/releng-unagi.tt
index 1272491a86c32aed62a3b2ae9f90b2a3261208a2..f8ea002eb2a06f89372ff87dbf66c109c5d351c5 100644
--- a/b2g/config/unagi/releng-unagi.tt
+++ b/b2g/config/unagi/releng-unagi.tt
@@ -4,5 +4,11 @@
 "digest": "553e88831f0760ef8de039a037c91499ff9334691f0532835c73a44352750a4911752cf0d5346f5e023f64b2351ed7f49a2a833c27538ddde59ad505f50ab063",
 "algorithm": "sha512",
 "filename": "gonk.tar.xz"
+},
+{
+"size": 8859648,
+"digest": "05d4a99e0f36cd91d1b10a2b558979ea776e9a7e03b8a921af3b0bfc62e2d96cf4faa20586c39885b6f8b25089fe07726794620a3b18c4826a2f71e29d90a8ef",
+"algorithm": "sha512",
+"filename": "boot.img"
 }
 ]