diff --git a/browser_patches/buildbots/README.md b/browser_patches/buildbots/README.md
index 1629dda7d4..4a27b1fa52 100644
--- a/browser_patches/buildbots/README.md
+++ b/browser_patches/buildbots/README.md
@@ -144,6 +144,9 @@ Make sure to change the following fields:
 
       <key>AZ_ACCOUNT_KEY</key>
       <string></string>
+
+      <key>MOZ_NOSPAM</key>
+      <string>1</string>
     </dict>
 
 
@@ -160,3 +163,6 @@ Make sure to change the following fields:
 ```
 
 Next, you can either use `launchctl load` command to load the daemon, or reboot bot to make sure it auto-starts.
+
+> **NOTE**: mozbuild uses [terminal-notifier](https://github.com/julienXX/terminal-notifier) which hangs
+> in launchctl environment. The `MOZ_NOSPAM` env variable disables terminal notifications.
diff --git a/browser_patches/buildbots/buildbot-linux.sh b/browser_patches/buildbots/buildbot-linux.sh
index f792513b46..67897743c7 100755
--- a/browser_patches/buildbots/buildbot-linux.sh
+++ b/browser_patches/buildbots/buildbot-linux.sh
@@ -55,7 +55,7 @@ if [[ -n $(git status -s) ]]; then
 fi
 
 git pull origin master
-../checkout_build_archive_upload.sh firefox >/tmp/$(basename $0)-firefox-log.log
+../checkout_build_archive_upload.sh firefox >/tmp/$(basename $0)-firefox-log.log || true
 
 git pull origin master
-../checkout_build_archive_upload.sh webkit >/tmp/$(basename $0)-webkit-log.log
+../checkout_build_archive_upload.sh webkit >/tmp/$(basename $0)-webkit-log.log || true
diff --git a/browser_patches/buildbots/buildbot-mac-10.14.sh b/browser_patches/buildbots/buildbot-mac-10.14.sh
index 339dcc2e39..6884195c59 100755
--- a/browser_patches/buildbots/buildbot-mac-10.14.sh
+++ b/browser_patches/buildbots/buildbot-mac-10.14.sh
@@ -61,7 +61,7 @@ if [[ -n $(git status -s) ]]; then
 fi
 
 git pull origin master
-../checkout_build_archive_upload.sh firefox >/tmp/$(basename $0)-firefox-log.log
+../checkout_build_archive_upload.sh firefox >/tmp/$(basename $0)-firefox-log.log || true
 
 git pull origin master
-../checkout_build_archive_upload.sh webkit >/tmp/$(basename $0)-webkit-log.log
+../checkout_build_archive_upload.sh webkit >/tmp/$(basename $0)-webkit-log.log || true
diff --git a/browser_patches/buildbots/buildbot-mac-10.15.sh b/browser_patches/buildbots/buildbot-mac-10.15.sh
index c7500db06b..3daa5d4314 100755
--- a/browser_patches/buildbots/buildbot-mac-10.15.sh
+++ b/browser_patches/buildbots/buildbot-mac-10.15.sh
@@ -62,4 +62,4 @@ if [[ -n $(git status -s) ]]; then
 fi
 
 git pull origin master
-../checkout_build_archive_upload.sh webkit >/tmp/$(basename $0)-webkit-log.log
+../checkout_build_archive_upload.sh webkit >/tmp/$(basename $0)-webkit-log.log || true