diff --git a/.github/actions/prepare-for-release/action.yml b/.github/actions/prepare-for-release/action.yml
index fbc61e8..de009d6 100644
--- a/.github/actions/prepare-for-release/action.yml
+++ b/.github/actions/prepare-for-release/action.yml
@@ -29,7 +29,10 @@ runs:
         dotnet tool install --global wix --version 4.0.6
         for rid in ${{ inputs.rids }}; do
           dotnet publish ./DesktopClock/DesktopClock.csproj -o "publish/$rid" -c Release -r $rid -p:Version=${{ inputs.version }}
-          wix build Product.wxs -dMainExeSource="publish/$rid/DesktopClock.exe" -o "publish/$rid/Install DesktopClock ${{ inputs.version }} ${rid}.msi"
+          (
+            cd "publish/$rid" &&
+            wix build Product.wxs -o "DesktopClock-${{ inputs.version }}-${rid}.msi"
+          )
         done
 
     - uses: actions/upload-artifact@v4
diff --git a/Product.wxs b/Product.wxs
index 1ac20b9..d3d6d99 100644
--- a/Product.wxs
+++ b/Product.wxs
@@ -48,7 +48,7 @@
   <Fragment>
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
       <Component Id="MainExe" Guid="2148738D-B1F4-48BD-8615-1617541C6BB3">
-        <File Id="MainExe" Name="$(var.Name).exe" Source="$(var.MainExeSource)" />
+        <File Id="MainExe" Name="$(var.Name).exe" Source="$(var.Name).exe" />
       </Component>
     </ComponentGroup>
   </Fragment>