diff --git a/master/custom/builders.py b/master/custom/builders.py
index 5533e607..85058082 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -52,8 +52,6 @@
     MacOSArmWithBrewBuild,
     MacOSArmWithBrewNoGilBuild,
     MacOSArmWithBrewNoGilRefleakBuild,
-    WindowsARM64Build,
-    WindowsARM64ReleaseBuild,
     Wasm32WasiCrossBuild,
     Wasm32WasiPreview1DebugBuild,
     Wasm32WasiPlatformDebugBuild,
@@ -286,8 +284,8 @@ def generate_builderdefs(tags, entries):
     ("wasm32-wasi", "bcannon-wasi", Wasm32WasiPlatformDebugBuild),
 
     # Windows aarch64 MSVC
-    ("ARM64 Windows", "ware-win11-arm64", WindowsARM64Build),
-    ("ARM64 Windows Non-Debug", "ware-win11-arm64", WindowsARM64ReleaseBuild),
+    ("ARM64 Windows", "ware-win11-arm64", factories.WindowsARM64Build),
+    ("ARM64 Windows Non-Debug", "ware-win11-arm64", factories.WindowsARM64ReleaseBuild),
 
 ]))
 
@@ -473,6 +471,10 @@ def generate_builderdefs(tags, entries):
 
     # WebAssembly
     ("wasm32 WASI 8Core", "kushaldas-wasi", Wasm32WasiCrossBuild),
+
+    # Windows aarch64 MSVC
+    ("ARM64 Windows Refleaks", "ware-win11-arm64", factories.WindowsARM64RefleakBuild),
+    ("ARM64 Windows PGO", "ware-win11-arm64", factories.WindowsARM64PGOBuild),
 ]))
 
 
diff --git a/master/custom/factories.py b/master/custom/factories.py
index 85ed3678..2c68dc67 100644
--- a/master/custom/factories.py
+++ b/master/custom/factories.py
@@ -796,6 +796,21 @@ class WindowsARM64ReleaseBuild(WindowsARM64Build):
     # keep default cleanFlags, both configurations get cleaned
     factory_tags = ["win-arm64", "nondebug"]
 
+
+class WindowsARM64PGOBuild(WindowsARM64Build):
+    buildersuffix = ".pgo"
+    buildFlags = [*WindowsARM64Build.buildFlags, "--pgo"]
+    testFlags = [*WindowsARM64Build.testFlags, "+d"]
+    factory_tags = [*WindowsARM64Build.factory_tags, "nondebug", "pgo"]
+
+
+class WindowsARM64RefleakBuild(WindowsARM64Build):
+    buildersuffix = ".refleak"
+    testFlags = [*WindowsARM64Build.testFlags, *WindowsRefleakBuild.testFlags]
+    test_timeout = REFLEAK_TIMEOUT
+    factory_tags = [*WindowsARM64Build.factory_tags, "refleak"]
+
+
 ##############################################################################
 ##############################  WASI BUILDS  #################################
 ##############################################################################