diff --git a/installer-scripts/SwiftFormat-arm64.wxs b/installer-scripts/SwiftFormat-arm64.wxs
deleted file mode 100644
index 2c610e8a7..000000000
--- a/installer-scripts/SwiftFormat-arm64.wxs
+++ /dev/null
@@ -1,52 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package
-      Language="1033"
-      Manufacturer="nicklockwood"
-      Name="SwiftFormat for Windows aarch64"
-      UpgradeCode="12571ad2-06b7-46e0-9e03-209db2b5667d"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="SwiftFormat for Windows aarch64" />
-
-    <!-- NOTE(compnerd) use pre-3.0 schema for better compatibility. -->
-    <Media Id="1" Cabinet="SwiftFormat.cab" EmbedCab="yes" />
-
-    <!-- Directory Structure -->
-    <!-- WindowsVolume is not a StandardDirectory value, but rather a standard property. See https://github.com/wixtoolset/issues/issues/7314 -->
-    <SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
-    <Directory ComponentGuidGenerationSeed="ae6cd8c6-6eba-46ff-8784-d432fa64367e" Id="WINDOWSVOLUME">
-      <Directory Id="INSTALLDIR">
-        <Directory Id="Library" Name="Library">
-          <Directory Id="Developer" Name="Developer">
-            <Directory Id="Tools" Name="Tools">
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <!-- Components -->
-    <ComponentGroup Id="SwiftFormat">
-      <Component Id="swiftformat.exe" Directory="Tools" Guid="2803667e-f043-4bf8-94d6-f3926be39597">
-        <File Id="swiftformat.exe" Source="$(var.SWIFTFORMAT_BUILD)\swiftformat.exe" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="9e402459-cfe7-4476-a084-fc613016b626">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Tools" />
-    </Component>
-
-    <Feature Id="SwiftFormat" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="SwiftFormat for Windows aarch64" Level="1" Title="SwiftFormat (Windows aarch64)">
-      <ComponentGroupRef Id="SwiftFormat" />
-      <ComponentRef Id="EnvironmentVariables" />
-    </Feature>
-
-    <UI>
-      <ui:WixUI Id="WixUI_InstallDir" />
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
-    </UI>
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
-
-  </Package>
-</Wix>
diff --git a/installer-scripts/SwiftFormat.wixproj b/installer-scripts/SwiftFormat.wixproj
index dbbede2a5..502e98d94 100644
--- a/installer-scripts/SwiftFormat.wixproj
+++ b/installer-scripts/SwiftFormat.wixproj
@@ -19,7 +19,7 @@
   <!-- <Import Project="WiXCodeSigning.targets" /> -->
 
   <PropertyGroup>
-    <DefineConstants>ProductVersion=$(ProductVersion);SWIFTFORMAT_BUILD=$(SWIFTFORMAT_BUILD)</DefineConstants>
+    <DefineConstants>ProductVersion=$(ProductVersion);ProductArchitecture=$(ProductArchitecture);SWIFTFORMAT_BUILD=$(SWIFTFORMAT_BUILD)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,6 +27,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="SwiftFormat-$(ProductArchitecture).wxs" />
+    <Compile Include="SwiftFormat.wxs" />
   </ItemGroup>
 </Project>
diff --git a/installer-scripts/SwiftFormat-amd64.wxs b/installer-scripts/SwiftFormat.wxs
similarity index 62%
rename from installer-scripts/SwiftFormat-amd64.wxs
rename to installer-scripts/SwiftFormat.wxs
index 2af6cc6ce..9458396f4 100644
--- a/installer-scripts/SwiftFormat-amd64.wxs
+++ b/installer-scripts/SwiftFormat.wxs
@@ -2,42 +2,38 @@
   <Package
       Language="1033"
       Manufacturer="nicklockwood"
-      Name="SwiftFormat for Windows x86_64"
+      Name="SwiftFormat"
       UpgradeCode="98e01ac8-a17d-43fd-99ed-1cd8b58715bf"
       Version="$(var.ProductVersion)"
       Scope="perMachine">
-    <SummaryInformation Description="SwiftFormat for Windows x86_64" />
+    <SummaryInformation Description="SwiftFormat" />
 
     <!-- NOTE(compnerd) use pre-3.0 schema for better compatibility. -->
     <Media Id="1" Cabinet="SwiftFormat.cab" EmbedCab="yes" />
 
-    <!-- Directory Structure -->
     <!-- WindowsVolume is not a StandardDirectory value, but rather a standard property. See https://github.com/wixtoolset/issues/issues/7314 -->
     <SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
+
     <Directory ComponentGuidGenerationSeed="7818d7fe-5173-4a41-9809-e72263ea9738" Id="WINDOWSVOLUME">
       <Directory Id="INSTALLDIR">
         <Directory Id="Library" Name="Library">
           <Directory Id="Developer" Name="Developer">
             <Directory Id="Tools" Name="Tools">
+              <Component Id="swiftformat.exe">
+                <File Id="swiftformat.exe" Source="$(var.SWIFTFORMAT_BUILD)\swiftformat.exe" Checksum="yes" />
+              </Component>
             </Directory>
           </Directory>
         </Directory>
+
+        <Component Id="EnvironmentVariables" Guid="b46687c3-f836-47e5-9b43-d9fd2552a731">
+          <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Tools" />
+        </Component>
       </Directory>
     </Directory>
 
-    <!-- Components -->
-    <ComponentGroup Id="SwiftFormat">
-      <Component Id="swiftformat.exe" Directory="Tools" Guid="77126634-5f91-40a7-b344-035ce99ef46f">
-        <File Id="swiftformat.exe" Source="$(var.SWIFTFORMAT_BUILD)\swiftformat.exe" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="b46687c3-f836-47e5-9b43-d9fd2552a731">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Tools" />
-    </Component>
-
-    <Feature Id="SwiftFormat" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="SwiftFormat for Windows x86_64" Level="1" Title="SwiftFormat (Windows x86_64)">
-      <ComponentGroupRef Id="SwiftFormat" />
+    <Feature Id="SwiftFormat" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="SwiftFormat" Level="1" Title="SwiftFormat">
+      <ComponentRef Id="swiftformat.exe" />
       <ComponentRef Id="EnvironmentVariables" />
     </Feature>