diff --git a/configure.ac b/configure.ac
index 15ae92e2a871..e6c208e4cd50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15763,8 +15763,7 @@ else
         fi
         if test "$WIN_BUILD_ARCH" = "arm64"; then
             # needed for msi packaging - as of 10.0.22621 SDK no arm64 ones yet
-            # the x86 ones probably would work just as well...
-            pathmunge "$WINDOWS_SDK_BINDIR_NO_ARCH/arm" "before"
+            pathmunge "$WINDOWS_SDK_BINDIR_NO_ARCH/x86" "before"
         fi
         # .NET 4.6 and higher don't have bin directory
         if test -f "$DOTNET_FRAMEWORK_HOME/bin"; then
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 51e91af12be3..3b392c4fd4a1 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -524,6 +524,8 @@ sub get_template_for_sis
 
     if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 )) { $architecture = "x64"; }
 
+    $architecture = "Arm64" if($ENV{'RTL_ARCH'} eq "AARCH64");
+
     my $value = "\"" . $architecture . ";" . $windowslanguage;  # adding the Windows language
 
     $value = $value . "\"";                     # adding ending '"'