diff --git a/.github/workflows/src/windows_mozconfig b/.github/workflows/src/windows_mozconfig
index 51836b0d4..d5bade4b3 100644
--- a/.github/workflows/src/windows_mozconfig
+++ b/.github/workflows/src/windows_mozconfig
@@ -8,11 +8,13 @@ export WINEDEBUG=-all
 #? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
 #? https://phabricator.services.mozilla.com/D170170
 ac_add_options --target=x86_64-pc-windows-msvc
+ac_add_options --with-toolchain-prefix=x86_64-pc-mingw32
 
 export MOZ_STUB_INSTALLER=1
 export MOZ_PKG_FORMAT=TAR
 
 export CROSS_BUILD=1
+CROSS_COMPILE=1
 POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
 TOOLS=$(echo ~)/win-cross
 
@@ -29,4 +31,6 @@ export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64"
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
 
+ac_add_options --enable-optimize="-mavx -maes /O2 /clang:-O3 /arch:AVX"
+
 # ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE
\ No newline at end of file
diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig
index fbde04556..3e5533393 100644
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -15,15 +15,16 @@ if ! test "$ZEN_CROSS_COMPILING"; then
     fi
 
     ac_add_options --enable-linker=lld
-    ac_add_options --enable-strip
-    export STRIP_FLAGS="--strip-debug --strip-unneeded"
 fi
 
 if test "$ZEN_RELEASE"; then
-if ! test "$ZEN_CROSS_COMPILING"; then
-    export MOZ_PGO=1
-    ac_add_options MOZ_PGO=1
-fi
+    ac_add_options --enable-strip
+    export STRIP_FLAGS="--strip-debug --strip-unneeded"
+
+    if ! test "$ZEN_CROSS_COMPILING"; then
+        export MOZ_PGO=1
+        ac_add_options MOZ_PGO=1
+    fi
 fi
 
 # Disable telemetry and tracking