diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index b5f76f1b2..8292c2b9f 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -25,6 +25,8 @@ export MOZ_INCLUDE_SOURCE_INFO=1
 ac_add_options --enable-application=browser
 
 if test "$ZEN_RELEASE"; then
+  export MOZ_AUTOMATION=1
+
   ac_add_options --enable-clang-plugin
   ac_add_options --enable-bootstrap
 
@@ -33,6 +35,7 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --disable-debug-symbols
   ac_add_options --disable-debug-js-modules
   ac_add_options --disable-tests
+  ac_add_options --disable-js-shell
 
   ac_add_options --disable-vtune
 
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 117a3a1dc..b7a57bbcb 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -25,21 +25,17 @@ fi
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
 
-ac_add_options --disable-clang-plugin
-
 if test "$SURFER_COMPAT" = "x86_64"; then
-  # FIXME: For some reason, the clang plugin is not working on generic x86_64 builds
-  ac_add_options --disable-clang-plugin
 
   ac_add_options --target=x86_64-pc-windows-msvc
   ac_add_options --enable-eme=widevine
 
   ac_add_options --enable-optimize="-O3 -w -ftree-vectorize"
 
-  export CFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
-  export CPPFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
-  export CXXFLAGS="-flto=thin -mtune=haswell -march=x86-64 -O2 -Qvec -w"
-  export LDFLAGS="-Wl,-O2"
+  export CFLAGS="-O3 -Qvec -w"
+  export CPPFLAGS="-O3 -Qvec -w"
+  export CXXFLAGS="-O3 -Qvec -w"
+  export LDFLAGS="-Wl,-O3"
   export RUSTFLAGS="-Clink-args=--icf=safe -C codegen-units=1 -Ctarget-cpu=x86-64"
 elif test "$SURFER_COMPAT" = "aarch64"; then
   ac_add_options --target=aarch64-pc-windows-msvc