diff --git a/src/vpk/Velopack.Packaging.Windows/Msi/MsiBuilder.cs b/src/vpk/Velopack.Packaging.Windows/Msi/MsiBuilder.cs
index 72b94d99..b0775d3d 100644
--- a/src/vpk/Velopack.Packaging.Windows/Msi/MsiBuilder.cs
+++ b/src/vpk/Velopack.Packaging.Windows/Msi/MsiBuilder.cs
@@ -57,7 +57,8 @@ public static class MsiBuilder
             AppMsiVersion = msiVersion,
             AppVersion = parsedVersion.ToFullString(),
             SourceDirectoryPath = portableDir.FullName,
-            Is64Bit = options.TargetRuntime.Architecture is not RuntimeCpu.x86,
+            Is64Bit = options.TargetRuntime.Architecture is not RuntimeCpu.x86 and not RuntimeCpu.Unknown,
+            IsArm64 = options.TargetRuntime.Architecture is RuntimeCpu.arm64,
             CultureLCID = CultureInfo.GetCultureInfo("en-US").TextInfo.ANSICodePage,
             InstallForAllUsers = options.InstLocation.HasFlag(InstallLocation.PerMachine),
             InstallForCurrentUser = options.InstLocation.HasFlag(InstallLocation.PerUser),
@@ -81,8 +82,8 @@ public static class MsiBuilder
     [SupportedOSPlatform("windows")]
     public static void CompileWixMsi(ILogger Log, MsiTemplateData data, Action<int> progress, string outputFilePath)
     {
-        bool as64Bit = data.Is64Bit;
-        Log.Info($"Configuring WiX in {(as64Bit ? "64-bit" : "32-bit")} mode");
+        var wixArch = data.IsArm64 ? "arm64" : data.Is64Bit ? "x64" : "x86";
+        Log.Info($"Configuring WiX in {wixArch} mode");
 
         var _1 = TempUtil.GetTempDirectory(out var outputDir);
         var wixId = data.WixId;
@@ -91,6 +92,7 @@ public static class MsiBuilder
 
         var (wxsContent, localizationContent) = GenerateWixTemplate(data);
 
+        // File.WriteAllText(@"C:\Source\velopack\samples\CSharpAvalonia\releases\test.wxs", wxsContent, Encoding.UTF8);
         File.WriteAllText(wxsPath, wxsContent, Encoding.UTF8);
         File.WriteAllText(localizationPath, localizationContent, Encoding.UTF8);
 
@@ -103,7 +105,7 @@ public static class MsiBuilder
         //When localization is supported in Velopack, we will need to add -culture here:
         //https://docs.firegiant.com/wix/tools/wixext/wixui/
         var buildCommand =
-            $"\"{HelperFile.WixPath}\" build -platform {(as64Bit ? "x64" : "x86")} -outputType Package " +
+            $"\"{HelperFile.WixPath}\" build -arch {wixArch} -outputType Package " +
             $"-pdbType none {string.Join(" ", wixExtensions.Select(x => $"-ext \"{x}\""))} -loc \"{localizationPath}\" -out \"{outputFilePath}\" \"{wxsPath}\"";
 
         _ = Exe.RunHostedCommand(buildCommand);
diff --git a/src/vpk/Velopack.Packaging.Windows/Msi/MsiTemplateData.cs b/src/vpk/Velopack.Packaging.Windows/Msi/MsiTemplateData.cs
index f2de6343..711c28b0 100644
--- a/src/vpk/Velopack.Packaging.Windows/Msi/MsiTemplateData.cs
+++ b/src/vpk/Velopack.Packaging.Windows/Msi/MsiTemplateData.cs
@@ -6,6 +6,7 @@ public class MsiTemplateData
     public string SourceDirectoryPath;
     public string RustNativeModulePath;
     public bool Is64Bit;
+    public bool IsArm64;
     public int CultureLCID;
     public string UpgradeCodeGuid;
     public string ComponentGenerationSeedGuid;
diff --git a/src/vpk/Velopack.Packaging/HelperFile.cs b/src/vpk/Velopack.Packaging/HelperFile.cs
index 977516bc..f96612f2 100644
--- a/src/vpk/Velopack.Packaging/HelperFile.cs
+++ b/src/vpk/Velopack.Packaging/HelperFile.cs
@@ -42,6 +42,7 @@ public static class HelperFile
         return FindHelperFile("velopack_wix.dll");
 #else
         return target.Architecture switch {
+            RuntimeCpu.Unknown => FindHelperFile("velopack_wix_x86.dll"),
             RuntimeCpu.x86 => FindHelperFile("velopack_wix_x86.dll"),
             RuntimeCpu.x64 => FindHelperFile("velopack_wix_x64.dll"),
             RuntimeCpu.arm64 => FindHelperFile("velopack_wix_arm64.dll"),