diff --git a/.patch/boost/0002-use-marmasm.patch b/.patch/boost/0002-use-marmasm.patch
new file mode 100644
index 0000000000..deef42079d
--- /dev/null
+++ b/.patch/boost/0002-use-marmasm.patch
@@ -0,0 +1,11 @@
+--- a/libs/context/CMakeLists.txt	2025-09-08 00:42:31.303651800 -0400
++++ b/libs/context/CMakeLists.txt	2025-09-08 00:42:40.592184300 -0400
+@@ -146,7 +146,7 @@
+       set(ASM_LANGUAGE ASM)
+     endif()
+   elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
+-    set(ASM_LANGUAGE ASM_ARMASM)
++    set(ASM_LANGUAGE ASM_MARMASM)
+   else()
+     set(ASM_LANGUAGE ASM_MASM)
+   endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 694aa6f4fe..640b5ccdfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -366,11 +366,6 @@ if (YUZU_USE_CPM)
 
     # boost
     set(BOOST_INCLUDE_LIBRARIES algorithm icl pool container heap asio headers process filesystem crc variant)
-    if (MSVC AND ARCHITECURE_arm64)
-        set(BOOST_USE_PREBUILT OFF)
-        set(BOOST_CONTEXT_ASM OFF)
-        set(BOOST_B2_OPTIONS=address-model=64 architecture=arm target-os=windows toolset=msvc)
-    endif()
 
     AddJsonPackage(boost)
 
diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index 382eb1a2ef..d2bfb292cb 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -30,12 +30,10 @@
     "cpp-jwt": {
         "version": "1.4",
         "repo": "crueter/cpp-jwt",
-        "sha": "ce992811fe",
-        "hash": "d86f1495dc42189636cde959fcbd06334113aa81af0abb5b096a9ef29c51ad391cc56e2f1b5d627bf8805efd838d28f39cc1687caa4db6a3d49934232762742c",
+        "sha": "12e1d43708",
+        "hash": "37ecd93a2ec48f1f0ab81670a264fa3c720c84d104ac7c442a6ff3bb97c90d26ad64e34665bb60f3cc861353bee15e6a0172fe60fd52fcb3aeadf0e78c9689dc",
         "find_args": "CONFIG",
         "options": [
-            "CPP_JWT_BUILD_EXAMPLES OFF",
-            "CPP_JWT_BUILD_TESTS OFF",
             "CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF"
         ]
     },