diff --git a/mozconfigs/windows/uxp-win32-gcc b/mozconfigs/windows/uxp-win32-gcc
index 023f82053c..7942ebe0a8 100644
--- a/mozconfigs/windows/uxp-win32-gcc
+++ b/mozconfigs/windows/uxp-win32-gcc
@@ -2,14 +2,12 @@
 
 ##Uncomment PGO for release build
 
-# 16 jobs for 16 cores
-mk_add_options MOZ_MAKE_FLAGS="-j6"
+# auto detect threads
+mk_add_options MOZ_MAKE_FLAGS="-j$NUMBER_OF_PROCESSORS"
 
 # x86 build
 ac_add_options --host=i686-pc-mingw32
 ac_add_options --target=i686-pc-mingw32
-WIN32_REDIST_DIR=$VCINSTALLDIR/Redist/MSVC/14.16.27012/x86
-WIN_UCRT_REDIST_DIR=$WINDOWSSDKDIR/Redist/10.0.19041.0/ucrt/DLLs/r86
 
 # Force compiler + linker + tools
 
diff --git a/mozconfigs/windows/uxp-win32-msvc b/mozconfigs/windows/uxp-win32-msvc
index 9d4c9b5e45..3dc35ae129 100644
--- a/mozconfigs/windows/uxp-win32-msvc
+++ b/mozconfigs/windows/uxp-win32-msvc
@@ -2,13 +2,12 @@
 
 ##Uncomment PGO for release build
 
-# 16 jobs for 16 cores
-mk_add_options MOZ_MAKE_FLAGS="-j6"
+# auto detect threads
+mk_add_options MOZ_MAKE_FLAGS="-j$NUMBER_OF_PROCESSORS"
 
 # x86 build
 ac_add_options --host=i686-pc-mingw32
 ac_add_options --target=i686-pc-mingw32
-WIN32_REDIST_DIR=$VCINSTALLDIR/Redist/MSVC/14.16.27012/x86
 
 # Build only Hydra
 ac_add_options --enable-application=basilisk
diff --git a/mozconfigs/windows/uxp-win64-clang b/mozconfigs/windows/uxp-win64-clang
index 1e6ff25808..7ebfd50305 100644
--- a/mozconfigs/windows/uxp-win64-clang
+++ b/mozconfigs/windows/uxp-win64-clang
@@ -16,8 +16,8 @@ export PATH="$CLANG:$PATH"
 
 ##Uncomment PGO for release build
 
-# 16 jobs for 16 cores
-mk_add_options MOZ_MAKE_FLAGS="-j6"
+# auto detect threads
+mk_add_options MOZ_MAKE_FLAGS="-j$NUMBER_OF_PROCESSORS"
 
 # x64 build
 ac_add_options --host=x86_64-pc-mingw32
diff --git a/mozconfigs/windows/uxp-win64-msvc b/mozconfigs/windows/uxp-win64-msvc
index 07b583d00b..4dd6d6cfcb 100644
--- a/mozconfigs/windows/uxp-win64-msvc
+++ b/mozconfigs/windows/uxp-win64-msvc
@@ -1,5 +1,5 @@
-# 16 jobs for 16 cores
-mk_add_options MOZ_MAKE_FLAGS="-j16"
+# auto detect threads
+mk_add_options MOZ_MAKE_FLAGS="-j$NUMBER_OF_PROCESSORS"
 
 # x64 build
 ac_add_options --host=x86_64-pc-mingw32