diff --git a/mozconfigs/mozconfig-win-cross b/mozconfigs/mozconfig-win-cross-x64
similarity index 96%
rename from mozconfigs/mozconfig-win-cross
rename to mozconfigs/mozconfig-win-cross-x64
index 5ae0d43a809e6..132d27f9ca715 100644
--- a/mozconfigs/mozconfig-win-cross
+++ b/mozconfigs/mozconfig-win-cross-x64
@@ -4,11 +4,6 @@
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --with-toolchain-prefix=x86_64-pc-mingw32
 
-# x86 build
-#ac_add_options --target=i686-pc-mingw32
-#ac_add_options --with-toolchain-prefix=i686-pc-mingw32
-#ac_add_options --disable-sandbox
-
 # Please do not redistribute this build with official branding if you are not part of Eclipse Community.
 ac_add_options --with-app-name=r3dfox
 ac_add_options --with-app-basename=r3dfox
diff --git a/mozconfigs/mozconfig-win-cross-x86 b/mozconfigs/mozconfig-win-cross-x86
new file mode 100644
index 0000000000000..a167e13165162
--- /dev/null
+++ b/mozconfigs/mozconfig-win-cross-x86
@@ -0,0 +1,104 @@
+## mozconfig for compiling r3dfox Browser for Windows on Linux
+
+# x86 build
+ac_add_options --target=i686-pc-mingw32
+ac_add_options --with-toolchain-prefix=i686-pc-mingw32
+ac_add_options --disable-sandbox
+
+# Please do not redistribute this build with official branding if you are not part of Eclipse Community.
+ac_add_options --with-app-name=r3dfox
+ac_add_options --with-app-basename=r3dfox
+# For potential nightly experimentation enable the below and disable the above.
+#ac_add_options --with-branding=browser/branding/nightly
+#ac_add_options --with-app-name=plasmafox
+#ac_add_options --with-app-basename=Plasmafox
+ac_add_options --enable-official-branding
+
+# Updater stuffs
+ac_add_options --disable-update-agent
+ac_add_options --disable-updater
+# Enable if update server and signatures are figured out
+#ac_add_options --enable-nss-mar
+
+# 16 jobs for 16 cores
+mk_add_options MOZ_MAKE_FLAGS="-j16"
+
+# Build for Windows on Linux
+CROSS_COMPILE=1
+export WINEDEBUG=-all
+export DISPLAY=:2
+
+# Build only r3dfox
+ac_add_options --enable-application=browser
+ac_add_options --disable-artifact-builds
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_SOURCE_CHANGESET=iloveneedingtobodgechangesetfornoreason
+
+# Optimization settings
+ac_add_options --disable-accessibility
+ac_add_options --disable-debug
+ac_add_options --disable-debug-js-modules
+ac_add_options --disable-debug-symbols
+ac_add_options --disable-tests
+ac_add_options --enable-clang-plugin
+ac_add_options --enable-hardening
+ac_add_options --enable-install-strip
+ac_add_options --enable-jemalloc
+ac_add_options --enable-lto
+ac_add_options --enable-optimize="-Qunused-arguments -O2 -msse2 -Xclang -O3"
+ac_add_options --enable-release
+ac_add_options --enable-rust-simd
+ac_add_options --enable-strip
+MOZ_OPTIMIZE=1
+export MOZ_OPTIMIZE=1
+mk_add_options MOZ_OPTIMIZE=1
+export MOZILLA_OFFICIAL=1
+export STRIP_FLAGS="--strip-debug --strip-unneeded"
+
+# Media settings
+ac_add_options --disable-eme
+ac_add_options --enable-av1
+ac_add_options --enable-jxl
+ac_add_options --enable-raw
+ac_add_options --enable-webrtc
+
+# Add-ons
+ac_add_options --allow-addon-sideload
+ac_add_options --with-unsigned-addon-scopes=app,system
+
+# Client settings
+ac_add_options --disable-backgroundtasks
+ac_add_options --disable-bits-download
+ac_add_options --disable-crashreporter
+ac_add_options --disable-default-browser-agent
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-notification-server
+ac_add_options --disable-parental-controls
+ac_add_options --without-wasm-sandboxed-libraries
+mk_add_options MOZ_CRASHREPORTER=0
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=
+export MOZ_CRASHREPORTER=0
+export MOZ_DATA_REPORTING=0
+export MOZ_REQUIRE_SIGNING=
+export MOZ_TELEMETRY_REPORTING=
+
+# Set -Copt-level=3
+export OPT_LEVEL="3"
+ac_add_options OPT_LEVEL="3"
+export RUSTC_OPT_LEVEL="3"
+ac_add_options RUSTC_OPT_LEVEL="3"
+
+# Enable LTO
+export MOZ_LTO=1
+ac_add_options MOZ_LTO=1
+
+# Compiler, Linker, and Rust flags
+export CFLAGS="-Qunused-arguments -O2 -msse2 /clang:-O3"
+export CPPFLAGS="-Qunused-arguments -O2 -msse2 /clang:-O3"
+export CXXFLAGS="-Qunused-arguments -O2 -msse2 /clang:-O3"
+export LDFLAGS="-Wl,-O3 -msse2"
+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"
+export RUSTFLAGS="-C target-cpu=athlon64 -C target-feature=+sse2 -C codegen-units=1 -Z tune-cpu=athlon64"
+export VERBOSE=1
diff --git a/mozconfigs/mozconfig-win-debug b/mozconfigs/mozconfig-win-debug-x64
similarity index 90%
rename from mozconfigs/mozconfig-win-debug
rename to mozconfigs/mozconfig-win-debug-x64
index 0c38a9366c670..4c8cfabf48893 100644
--- a/mozconfigs/mozconfig-win-debug
+++ b/mozconfigs/mozconfig-win-debug-x64
@@ -1,10 +1,7 @@
 ## mozconfig for compiling r3dfox Browser for Windows natively
 
-##Uncomment PGO for release build
-
-#Uncomment for x86 build
-#ac_add_options --target=i686 
-#ac_add_options --disable-sandbox
+# x64 build
+ac_add_options --target=x86_64 
 
 # 16 jobs for 16 cores
 mk_add_options MOZ_MAKE_FLAGS="-j16"
diff --git a/mozconfigs/mozconfig-win-debug-x86 b/mozconfigs/mozconfig-win-debug-x86
new file mode 100644
index 0000000000000..18a8249b981dc
--- /dev/null
+++ b/mozconfigs/mozconfig-win-debug-x86
@@ -0,0 +1,43 @@
+## mozconfig for compiling r3dfox Browser for Windows natively
+
+# x86 build
+ac_add_options --target=i686 
+ac_add_options --disable-sandbox
+
+# 16 jobs for 16 cores
+mk_add_options MOZ_MAKE_FLAGS="-j16"
+
+# Build only r3dfox
+ac_add_options --enable-application=browser
+ac_add_options --disable-artifact-builds
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_SOURCE_CHANGESET=iloveneedingtobodgechangesetfornoreason
+
+# Media settings
+ac_add_options --disable-eme
+ac_add_options --enable-av1
+ac_add_options --enable-jxl
+ac_add_options --enable-raw
+ac_add_options --enable-webrtc
+
+# Add-ons
+ac_add_options --allow-addon-sideload
+ac_add_options --with-unsigned-addon-scopes=app,system
+
+# Client settings
+ac_add_options --disable-accessibility
+ac_add_options --disable-backgroundtasks
+ac_add_options --disable-bits-download
+ac_add_options --disable-default-browser-agent
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-notification-server
+ac_add_options --disable-parental-controls
+ac_add_options --disable-update-agent
+ac_add_options --disable-updater
+ac_add_options --enable-clang-plugin
+ac_add_options --enable-debug
+ac_add_options --without-wasm-sandboxed-libraries
+export CROSS_COMPILE=0
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_REQUIRE_SIGNING=
+export MOZ_SOURCE_CHANGESET=iloveneedingtobodgechangesetfornoreason
diff --git a/mozconfigs/mozconfig-win b/mozconfigs/mozconfig-win-x64
similarity index 97%
rename from mozconfigs/mozconfig-win
rename to mozconfigs/mozconfig-win-x64
index f46e81793c1b0..92cd7cb8ed097 100644
--- a/mozconfigs/mozconfig-win
+++ b/mozconfigs/mozconfig-win-x64
@@ -2,9 +2,8 @@
 
 ##Uncomment PGO for release build
 
-#Uncomment for x86 build
-#ac_add_options --target=i686 
-#ac_add_options --disable-sandbox
+# x64 build
+ac_add_options --target=x86_64 
 
 # Please do not redistribute this build with official branding if you are not part of Eclipse Community.
 ac_add_options --with-app-name=r3dfox
diff --git a/mozconfigs/mozconfig-win-x86 b/mozconfigs/mozconfig-win-x86
new file mode 100644
index 0000000000000..0853e1b0c5cee
--- /dev/null
+++ b/mozconfigs/mozconfig-win-x86
@@ -0,0 +1,108 @@
+## mozconfig for compiling r3dfox Browser for Windows natively
+
+##Uncomment PGO for release build
+
+# x86 build
+ac_add_options --target=i686 
+ac_add_options --disable-sandbox
+
+# Please do not redistribute this build with official branding if you are not part of Eclipse Community.
+ac_add_options --with-app-name=r3dfox
+ac_add_options --with-app-basename=r3dfox
+# For potential nightly experimentation enable the below and disable the above.
+#ac_add_options --with-branding=browser/branding/nightly
+#ac_add_options --with-app-name=plasmafox
+#ac_add_options --with-app-basename=Plasmafox
+ac_add_options --enable-official-branding
+
+# Updater stuffs
+ac_add_options --disable-update-agent
+ac_add_options --disable-updater
+# Enable if update server and signatures are figured out
+#ac_add_options --enable-nss-mar
+
+# 16 jobs for 16 cores
+mk_add_options MOZ_MAKE_FLAGS="-j16"
+
+# Build only r3dfox
+ac_add_options --enable-application=browser
+ac_add_options --disable-artifact-builds
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_SOURCE_CHANGESET=iloveneedingtobodgechangesetfornoreason
+
+# Optimization settings
+ac_add_options --disable-accessibility
+ac_add_options --disable-debug
+ac_add_options --disable-debug-js-modules
+ac_add_options --disable-debug-symbols
+ac_add_options --disable-tests
+ac_add_options --enable-clang-plugin
+ac_add_options --enable-hardening
+ac_add_options --enable-install-strip
+ac_add_options --enable-jemalloc
+ac_add_options --enable-lto
+ac_add_options --enable-optimize="-Qunused-arguments -O2 -msse2 -Xclang -O3"
+ac_add_options --enable-release
+ac_add_options --enable-rust-simd
+ac_add_options --enable-strip
+MOZ_OPTIMIZE=1
+export MOZ_OPTIMIZE=1
+mk_add_options MOZ_OPTIMIZE=1
+export MOZILLA_OFFICIAL=1
+export STRIP_FLAGS="--strip-debug --strip-unneeded"
+
+# Media settings
+ac_add_options --disable-eme
+ac_add_options --enable-av1
+ac_add_options --enable-jxl
+ac_add_options --enable-raw
+ac_add_options --enable-webrtc
+
+# Add-ons
+ac_add_options --allow-addon-sideload
+ac_add_options --with-unsigned-addon-scopes=app,system
+
+# Client settings
+ac_add_options --disable-backgroundtasks
+ac_add_options --disable-bits-download
+ac_add_options --disable-crashreporter
+ac_add_options --disable-default-browser-agent
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-notification-server
+ac_add_options --disable-parental-controls
+ac_add_options --without-wasm-sandboxed-libraries
+mk_add_options MOZ_CRASHREPORTER=0
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=
+export MOZ_CRASHREPORTER=0
+export MOZ_DATA_REPORTING=0
+export MOZ_REQUIRE_SIGNING=
+export MOZ_TELEMETRY_REPORTING=
+
+# Set -Copt-level=3
+export OPT_LEVEL="3"
+ac_add_options OPT_LEVEL="3"
+export RUSTC_OPT_LEVEL="3"
+ac_add_options RUSTC_OPT_LEVEL="3"
+
+# Enable LTO
+export MOZ_LTO=1
+ac_add_options MOZ_LTO=1
+#export MOZ_PGO=1
+#ac_add_options MOZ_PGO=1
+
+if test "$GEN_PGO"; then
+    ac_add_options --enable-profile-generate
+elif test "$USE_PGO"; then
+    ac_add_options --enable-profile-use=cross
+fi
+
+# Compiler, Linker, and Rust flags
+export CFLAGS="-Qunused-arguments -O2 -msse2 /clang:-O3"
+export CPPFLAGS="-Qunused-arguments -O2 -msse2 /clang:-O3"
+export CXXFLAGS="-Qunused-arguments -O2 -msse2 /clang:-O3"
+export LDFLAGS="-Wl,-O3 -msse2"
+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"
+export RUSTFLAGS="-C target-cpu=athlon64 -C target-feature=+sse2 -C codegen-units=1 -Z tune-cpu=athlon64"
+export VERBOSE=1