diff --git a/testing/firefox/build b/testing/firefox/build
index e35b3e08..c013fa0b 100755
--- a/testing/firefox/build
+++ b/testing/firefox/build
@@ -12,7 +12,7 @@
     make
     make install
 )
-export PATH="$PWD/autoconf/bin:$PATH"
+export PATH=$PWD/autoconf/bin:$PATH
 
 unset  MOZ_TELEMETRY_REPORTING
 export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox"
@@ -24,7 +24,7 @@ for patch in *.patch; do
     patch -p1 < "$patch"
 done
 
-./mach -j "$(nproc)" -l "$(nproc)" build
+./mach build
 DESTDIR="$1" ./mach install
 
 rm -rf "$1/usr/include"
@@ -37,3 +37,4 @@ rm -f  "$1/usr/lib/firefox/browser/features/webcompat-reporter@mozilla.org.xpi"
 rm -f  "$1/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi"
 
 install -D vendor.js "$1/usr/lib/firefox/browser/defaults/preferences/vendor.js"
+install -D policies.json "$1/usr/lib/firefox/distribution/policies.json"
diff --git a/testing/firefox/checksums b/testing/firefox/checksums
index caa93576..3170db03 100644
--- a/testing/firefox/checksums
+++ b/testing/firefox/checksums
@@ -2,7 +2,8 @@
 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e  autoconf-2.13.tar.gz
 143c5f3348713eaa0850c9ba5b0233603a85764feda9fa5b267f9f4424d03f4c  mozconfig
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
-ace06211bbd174b320fbb19e3ac8e34e71bd3ebf4cde1df0c5ebe613fd5d4f88  vendor.js
+48d0cb26d434f8ed3f241110d72f919677bad845e731d6618ca23d7c7c3f52c1  vendor.js
+d28a14540272b9872c339f48549a961c8a8911417b43c5fb82ad04e6142f08c5  policies.json
 315880530f09175788dfa48a1915bfa1e190bfd3e267988b9100cb93006c808c  fix-fortify-system-wrappers.patch
 418a2a9f80c41ee004cb640968617cab283b99f3d109aaf6180b0088d60c84b0  fix-sandbox-membarrier.patch
 14f281ee323aa682e04479019171bde243ac6227820856aa03b162179b14bfd9  fix-seccomp-bpf.patch
diff --git a/testing/firefox/files/policies.json b/testing/firefox/files/policies.json
new file mode 100644
index 00000000..98bf5d06
--- /dev/null
+++ b/testing/firefox/files/policies.json
@@ -0,0 +1,17 @@
+{
+	"policies": {
+		"DisableAppUpdate": true,
+		"DisableFirefoxStudies": true,
+		"DisablePocket": true,
+		"DisableTelemetry": true,
+        "DisableFirefoxStudies": true,
+        "DisableFeedbackCommands": true,
+        "DisableFirefoxScreenshots": true,
+        "DisableSystemAddonUpdate": true,
+        "DontCheckDefaultBrowser": true,
+        "ExtensionUpdate": false,
+        "NetworkPrediction": false,
+		"DontCheckDefaultBrowser": true,
+        "CaptivePortal": false
+	}
+}
diff --git a/testing/firefox/files/vendor.js b/testing/firefox/files/vendor.js
index d8a22f4f..cfbd2244 100644
--- a/testing/firefox/files/vendor.js
+++ b/testing/firefox/files/vendor.js
@@ -444,6 +444,8 @@ pref("extensions.getAddons.cache.enabled",	false);
 pref("lightweightThemes.update.enabled", false);
 pref("extensions.systemAddon.update.enabled", false);
 pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr", false);
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
 
 //
 // STORAGE
diff --git a/testing/firefox/sources b/testing/firefox/sources
index bc7c74d8..e9f4cddf 100644
--- a/testing/firefox/sources
+++ b/testing/firefox/sources
@@ -3,6 +3,7 @@ https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
 files/mozconfig firefox/
 files/stab.h firefox/toolkit/crashreporter/google-breakpad/src/
 files/vendor.js firefox/
+files/policies.json firefox/
 patches/fix-fortify-system-wrappers.patch firefox/
 patches/fix-sandbox-membarrier.patch firefox/
 patches/fix-seccomp-bpf.patch firefox/