diff --git a/scripts/base.py b/scripts/base.py
index 4f0f427..5cfa25a 100644
--- a/scripts/base.py
+++ b/scripts/base.py
@@ -1872,6 +1872,9 @@ def create_x2t_js_cache(dir, product, platform):
   if ((platform == "linux_arm64") and not is_os_arm()):
     cmd_in_dir_qemu(platform, dir, "./x2t", ["-create-js-snapshots"], True)
     return
+  
+  if platform == "win_arm64": # copying sdkjs later
+    return
 
   cmd_in_dir(dir, "./x2t", ["-create-js-snapshots"], True)
   return
diff --git a/scripts/core_common/modules/icu.py b/scripts/core_common/modules/icu.py
index 55a1cd3..b2360c3 100755
--- a/scripts/core_common/modules/icu.py
+++ b/scripts/core_common/modules/icu.py
@@ -61,7 +61,7 @@ def make():
       need_platforms.append("win_arm64")
       
     for platform in need_platforms:
-      if not config.check_option("platform", platform) and not config.check_option("platform", platform + "_xp") and not config.check_option("platform", "win_arm64"):
+      if not config.check_option("platform", platform) and not config.check_option("platform", platform + "_xp"):
         continue
       
       if not base.is_dir(platform + "/build"):
diff --git a/scripts/deploy_builder.py b/scripts/deploy_builder.py
index accb406..0ae98e5 100644
--- a/scripts/deploy_builder.py
+++ b/scripts/deploy_builder.py
@@ -15,6 +15,7 @@ def make():
       continue
 
     root_dir = base_dir + ("/" + native_platform + "/" + branding + ("/DocumentBuilder" if base.is_windows() else "/documentbuilder"))
+    root_dir_win64 = base_dir + "/win_64/" + branding + "/DocumentBuilder"
     if (base.is_dir(root_dir)):
       base.delete_dir(root_dir)
     base.create_dir(root_dir)
@@ -134,6 +135,10 @@ def make():
     base.copy_dir(git_dir  + "/core-fonts/crosextra",  root_dir + "/fonts/crosextra")
     base.copy_dir(git_dir  + "/core-fonts/openoffice", root_dir + "/fonts/openoffice")
     base.copy_file(git_dir + "/core-fonts/ASC.ttf",    root_dir + "/fonts/ASC.ttf")
+    
+    if native_platform == "win_arm64":
+      base.delete_dir(root_dir + "/sdkjs")
+      base.copy_dir(root_dir_win64 + "/sdkjs", root_dir + "/sdkjs")
   
     # delete unnecessary builder files
     def delete_files(files):
diff --git a/scripts/deploy_core.py b/scripts/deploy_core.py
index cd653d3..fee9bb5 100644
--- a/scripts/deploy_core.py
+++ b/scripts/deploy_core.py
@@ -70,6 +70,11 @@ def make():
     base.generate_doctrenderer_config(archive_dir + "/DoctRenderer.config", "./", "builder", "", "./dictionaries")
     base.create_x2t_js_cache(archive_dir, "core", platform)
     base.delete_file(archive_dir + "/DoctRenderer.config")
+    
+    # just copy sdkjs to avoid executing arm64 x2t on non-arm system
+    if native_platform == "win_arm64" :
+      base.delete_dir(archive_dir + "/sdkjs")
+      base.copy_dir(archive_dir + "/../../../win_64/" + branding + "/core/sdkjs", archive_dir + "/sdkjs")
 
     # dictionaries
     base.copy_dictionaries(git_dir + "/dictionaries", archive_dir + "/dictionaries", True, False)