diff --git a/mozconfigs/windows/uxp-win32-mingw32 b/mozconfigs/windows/uxp-win32-gcc
similarity index 100%
rename from mozconfigs/windows/uxp-win32-mingw32
rename to mozconfigs/windows/uxp-win32-gcc
diff --git a/mozconfigs/windows/uxp-win64-clang b/mozconfigs/windows/uxp-win64-clang
new file mode 100644
index 0000000000..d452f8d2a5
--- /dev/null
+++ b/mozconfigs/windows/uxp-win64-clang
@@ -0,0 +1,89 @@
+## UXP mozconfig thing based off roytam1's config and r3dfox config
+
+# ============================
+# Force clang-cl toolchain
+# ============================
+
+export CLANG=/c/clang/bin
+
+# Force compiler + linker + tools
+export CC="clang-cl.exe"
+export MT="llvm-mt.exe"
+export LD="lld-link.exe"
+export LIB="lib.exe"
+
+# Force PATH so UXP thinks only Clang is there
+export PATH="$CLANG:$PATH"
+
+##Uncomment PGO for release build
+
+# 16 jobs for 16 cores
+mk_add_options MOZ_MAKE_FLAGS="-j6"
+
+# x64 build
+ac_add_options --host=x86_64-pc-mingw32
+ac_add_options --target=x86_64-pc-mingw32
+
+# Build only Hydra
+ac_add_options --enable-application=basilisk
+ac_add_options --disable-artifact-builds
+
+# Updater stuffs
+ac_add_options --disable-updater
+# Enable if update server and signatures are figured out
+#ac_add_options --enable-nss-mar
+
+# 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-devtools
+#ac_add_options --enable-install-strip
+ac_add_options --enable-jemalloc
+ac_add_options --enable-js-lto
+ac_add_options --enable-optimize="-O2 -Ob2ity -openmp -arch:AVX -w0 -w"
+ac_add_options --enable-phoenix-extensions
+ac_add_options --enable-release
+ac_add_options --enable-shared-js
+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 --enable-av1
+ac_add_options --enable-jxl
+ac_add_options --enable-raw
+ac_add_options --enable-webrtc
+
+# Client settings
+ac_add_options --disable-crashreporter
+ac_add_options --disable-eme
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-parental-controls
+ac_add_options --disable-ctypes
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+export CROSS_COMPILE=0
+export MOZ_CRASHREPORTER=0
+export MOZ_DATA_REPORTING=0
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_REQUIRE_SIGNING=
+export MOZ_SOURCE_CHANGESET=iloveneedingtobodgechangesetfornoreason
+export MOZ_TELEMETRY_REPORTING=
+export MOZ_PACKAGE_JSSHELL=1
+
+# Set -Copt-level=3
+export OPT_LEVEL="3"
+ac_add_options OPT_LEVEL="3"
+
+# Enable LTO
+export MOZ_LTO=1
+ac_add_options MOZ_LTO=1
+
+# Compiler and Linker flags
+export 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 VERBOSE=1
diff --git a/mozconfigs/windows/uxp-win64 b/mozconfigs/windows/uxp-win64-msvc
similarity index 100%
rename from mozconfigs/windows/uxp-win64
rename to mozconfigs/windows/uxp-win64-msvc