diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index 46cd0fc3c1d9f566f4b901413161a6c3260ecfd9..0d53c3257d5affe4993bf5e3fdf3182666436f8c 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -130,13 +130,12 @@ pref("browser.newtabpage.introShown", true);
 pref("browser.aboutHomeSnippets.updateUrl", "");
 // Always ask before restoring the browsing session
 pref("browser.sessionstore.max_resumed_crashes", 0);
- // Disable tracking protection by default, as it makes automated connections to fetch lists (not doing this until the newtab privacy block is reimplemented)
- //pref("browser.safebrowsing.provider.mozilla.updateURL", "");
-//pref("urlclassifier.trackingTable", "test-track-simple,base-track-digest256,content-track-digest256");
 pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tracking-protection/start/");
 // Disable geolocation
 pref("geo.enabled", false);
 pref("browser.search.geoip.url", "");
+pref("geo.provider-country.network.url", "");
+pref("browser.search.geoSpecificDefaults.url", "");
 // Disable captive portal detection
 pref("captivedetect.canonicalURL", "");
 pref("network.captive-portal-service.enabled", false);
@@ -177,6 +176,7 @@ pref("browser.search.update", false);
 
 // Disable channel updates
 pref("app.update.enabled", false);
+pref("app.update.url", "");
 pref("app.update.auto", false);
 pref("toolkit.telemetry.enabled", false);
 
@@ -268,3 +268,7 @@ pref("extensions.getAddons.search.browseURL", "https://trisquel.info/en/browser-
 // Disable pingback on first run
 pref("browser.newtabpage.activity-stream.fxaccounts.endpoint", "");
 
+
+// Disable Normandy (remote settings changer for AB testing)
+pref("app.normandy.enabled", false);
+pref("app.normandy.api_url", "");
diff --git a/helpers/make-firefox b/helpers/make-firefox
index ef18b4761cd1a5b4a5e095e7bb67ea285bd0c01a..88114a9ebdd7e339a7d2cb871f21b50537a72b10 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -18,19 +18,23 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=68
+VERSION=69
 
 . ./config
 
 patch -p1 < debian/patches/partially-revert-google-search-update.patch
 patch -p1 < debian/patches/no-region-overrides-for-google-search.patch
 
-sed 's/clang-9 |//' -i debian/control.in
-sed 's/libclang-9-dev |//' -i debian/control.in
-sed 's/llvm-9-dev |//' -i debian/control.in
+sed 's/clang-10 |//' -i debian/control.in
+sed 's/libclang-10-dev |//' -i debian/control.in
+sed 's/llvm-10-dev |//' -i debian/control.in
 
 rm debian/control
 
+# Disable remote settings antifeature.
+sed '/async fetchLatestChanges.*/areturn;' -i services/settings/Utils.jsm
+sed '/async download.*/areturn;' -i services/settings/RemoteSettingsClient.jsm services/settings/Attachments.jsm
+
 # Disable activity-stream antifeatures.
 # These are not condensed into a single sed script to make it fail on individual commands that didn't change the source
 ActivityStream=browser/components/newtab/lib/ActivityStream.jsm
@@ -43,7 +47,7 @@ sed '/read_more_endpoint/,+1s/http.*/",/' -i $ActivityStream
 sed '/stories_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStream
 sed '/stories_referrer/s/http.*/",/' -i $ActivityStream
 sed '/topics_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStream
-sed '/name: "section.topstories"/,/return/s/return.*/return false;/' -i $ActivityStream
+sed 's/preffedRegions.includes.geo. .. ..locales .. locales.includes.locale./false/' -i $ActivityStream
 sed 's/.Ubuntu., //' -i browser/components/newtab/css/activity-stream*.css
 echo "#header-asrouter-container{display: none!important;}" >> browser/components/newtab/css/activity-stream-linux.css
 
@@ -152,6 +156,7 @@ s|Nightly|Abrowser|g;
 s|brandProductName=Firefox|brandProductName=Abrowser|;
 s|Sign in to Firefox|Sign in to Sync|;
 s|Search addons.mozilla.org|Search|g;
+s|firefox.settings.services.mozilla.com|127.0.0.1|g;
 "
 
 echo "Running batch replace operation"