diff --git a/lw-linux-base/Makefile b/lw-linux-base/Makefile
index 0210e50..b2d9530 100644
--- a/lw-linux-base/Makefile
+++ b/lw-linux-base/Makefile
@@ -78,6 +78,7 @@ veryclean : clean
 
 # this is the place to apply patches and create a custom mozconfig
 pre-build :
+	mv -v librewolf-$(full_version)/mozconfig librewolf-$(full_version)/mozconfig.std
 	cp -v $(assets)/mozconfig.$(arch) librewolf-$(full_version)/mozconfig
 	./$(assets)/pre_build_patches_mozconfig.sh
 
diff --git a/lw-linux-base/assets/mozconfig.aarch64 b/lw-linux-base/assets/mozconfig.aarch64
index 53e1878..ca2f9e5 100644
--- a/lw-linux-base/assets/mozconfig.aarch64
+++ b/lw-linux-base/assets/mozconfig.aarch64
@@ -1,44 +1,5 @@
+. mozconfig.std
+
 ac_add_options --target=aarch64-pc-linux-gnu
 ac_add_options --enable-linker=lld
 ac_add_options --enable-bootstrap
-
-
-
-# ---
-
-
-#
-# Librewolf specific settings
-#
-
-ac_add_options --allow-addon-sideload
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-default-browser-agent
-ac_add_options --disable-tests
-# updater disabled in Settings repo (app.update.auto).
-# this setting toggles the urlbar 'star' bug
-# ac_add_options --disable-updater
-ac_add_options --enable-hardening
-ac_add_options --enable-optimize
-ac_add_options --enable-release
-ac_add_options --enable-rust-simd
-
-ac_add_options --with-app-name=librewolf
-ac_add_options --with-branding=browser/branding/librewolf
-
-ac_add_options --with-unsigned-addon-scopes=app,system
-
-# see issue # https://gitlab.com/librewolf-community/browser/arch/-/issues/49
-export MOZ_REQUIRE_SIGNING=
-
-mk_add_options MOZ_CRASHREPORTER=0
-mk_add_options MOZ_DATA_REPORTING=0
-mk_add_options MOZ_NORMANTY=0
-mk_add_options MOZ_SERVICES_HEALTHREPORT=0
-mk_add_options MOZ_TELEMETRY_REPORTING=0
-
-ac_add_options --enable-strip
-
-# Internationalization
-ac_add_options --with-l10n-base=$(pwd)/browser/locales/l10n
diff --git a/lw-linux-base/assets/mozconfig.x86_64 b/lw-linux-base/assets/mozconfig.x86_64
index 110d534..8f0e012 100644
--- a/lw-linux-base/assets/mozconfig.x86_64
+++ b/lw-linux-base/assets/mozconfig.x86_64
@@ -1,39 +1,4 @@
+. mozconfig.std
+
 ac_add_options --target=x86_64-pc-linux-gnu
 ac_add_options --enable-bootstrap
-
-
-#
-# Librewolf specific settings
-#
-
-ac_add_options --allow-addon-sideload
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-default-browser-agent
-ac_add_options --disable-tests
-# updater disabled in Settings repo (app.update.auto).
-# this setting toggles the urlbar 'star' bug
-# ac_add_options --disable-updater
-ac_add_options --enable-hardening
-ac_add_options --enable-optimize
-ac_add_options --enable-release
-ac_add_options --enable-rust-simd
-
-ac_add_options --with-app-name=librewolf
-ac_add_options --with-branding=browser/branding/librewolf
-
-ac_add_options --with-unsigned-addon-scopes=app,system
-
-# see issue # https://gitlab.com/librewolf-community/browser/arch/-/issues/49
-export MOZ_REQUIRE_SIGNING=
-
-mk_add_options MOZ_CRASHREPORTER=0
-mk_add_options MOZ_DATA_REPORTING=0
-mk_add_options MOZ_NORMANTY=0
-mk_add_options MOZ_SERVICES_HEALTHREPORT=0
-mk_add_options MOZ_TELEMETRY_REPORTING=0
-
-ac_add_options --enable-strip
-
-# Internationalization
-ac_add_options --with-l10n-base=$(pwd)/browser/locales/l10n