diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh
index 0112d45f94..0ed045e59a 100755
--- a/browser_patches/checkout_build_archive_upload.sh
+++ b/browser_patches/checkout_build_archive_upload.sh
@@ -110,16 +110,19 @@ elif [[ "$BUILD_FLAVOR" == "chromium-win64-mirror-to-cdn" ]]; then
   BUILD_BLOB_NAME="chromium-win64.zip"
 elif [[ "$BUILD_FLAVOR" == "firefox-ubuntu-18.04" ]]; then
   BROWSER_NAME="firefox"
+  EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="Ubuntu"
   EXPECTED_HOST_OS_VERSION="18.04"
   BUILD_BLOB_NAME="firefox-ubuntu-18.04.zip"
 elif [[ "$BUILD_FLAVOR" == "firefox-mac-10.14" ]]; then
   BROWSER_NAME="firefox"
+  EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="Darwin"
   EXPECTED_HOST_OS_VERSION="10.14"
   BUILD_BLOB_NAME="firefox-mac-10.14.zip"
 elif [[ "$BUILD_FLAVOR" == "firefox-mac-11.0-arm64" ]]; then
   BROWSER_NAME="firefox"
+  EXTRA_BUILD_ARGS="--full"
   EXPECTED_HOST_OS="Darwin"
   EXPECTED_HOST_OS_VERSION="11.0"
   EXPECTED_ARCH="arm64"
diff --git a/browser_patches/firefox/build.sh b/browser_patches/firefox/build.sh
index b7e0d65490..94ddbcc058 100755
--- a/browser_patches/firefox/build.sh
+++ b/browser_patches/firefox/build.sh
@@ -77,6 +77,10 @@ fi
 OBJ_FOLDER="obj-build-playwright"
 echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig
 
+if [[ $1 == "--full" ]]; then
+  SHELL=/bin/sh ./mach bootstrap --application-choice=browser --no-interactive --no-system-changes
+fi
+
 if ! [[ -f "$HOME/.mozbuild/_virtualenvs/mach/bin/python" ]]; then
   ./mach create-mach-environment
 fi