diff --git a/scripts/build-win-signed-cmake.yml b/scripts/build-win-signed-cmake.yml
index ac3ac2824..620379f0c 100644
--- a/scripts/build-win-signed-cmake.yml
+++ b/scripts/build-win-signed-cmake.yml
@@ -1,6 +1,7 @@
 parameters:
   ReleaseVersion: ''
   BuildArchitecture: ''
+  VCArchitecture: ''
 
 jobs:
 - job: WindowsBuild${{parameters.BuildArchitecture}}
@@ -18,6 +19,7 @@ jobs:
     displayName: Build
     inputs:
       script:
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{parameters.VCArchitecture}} &
         python scripts\mk_win_dist_cmake.py
             --${{parameters.BuildArchitecture}}-only
             --assembly-version=${{parameters.ReleaseVersion}}
diff --git a/scripts/mk_win_dist_cmake.py b/scripts/mk_win_dist_cmake.py
index adfb2e4dd..506288738 100644
--- a/scripts/mk_win_dist_cmake.py
+++ b/scripts/mk_win_dist_cmake.py
@@ -196,7 +196,7 @@ def mk_build_dir(arch):
     if not check_build_dir(build_path) or FORCE_MK:
         mk_dir(build_path)
         if arch == "arm64":
-            arch = "x64_arm64"
+            arch = "amd64_arm64"
 
         cmds = []
         cmds.append(f"cd {build_path}")
@@ -266,7 +266,7 @@ def build_z3(arch):
         print("build z3")
     build_dir = get_build_dir(arch)
     if arch == "arm64":
-        arch = "x64_arm64"
+        arch = "amd64_arm64"
     cmds = []
     cmds.append('call "%VCINSTALLDIR%Auxiliary\\build\\vcvarsall.bat" ' + arch)
     cmds.append('cd %s' % build_dir)
diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index 7339ff3c2..352bcf22b 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -154,17 +154,19 @@ stages:
     parameters:
       ReleaseVersion: $(ReleaseVersion)
       BuildArchitecture: 'x86'
+      VCArchitecture: 'x86'
 
   - template: build-win-signed-cmake.yml
     parameters:
       ReleaseVersion: $(ReleaseVersion)
       BuildArchitecture: 'x64'
+      VCArchitecture: 'x64'
 
   - template: build-win-signed-cmake.yml
     parameters:
       ReleaseVersion: $(ReleaseVersion)
       BuildArchitecture: 'arm64'
-
+      VCArchitecture: 'amd64_arm64'
 
 - stage: Package
   jobs: