diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eeb7f98..96c8ab8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -144,17 +144,17 @@ jobs:
           echo "$HOME/.dotnet/tools" >> $GITHUB_PATH
           echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH
 
-      - name: Create MSI (Windows)
+      - name: Generate file lists
         if: matrix.config.os == 'windows-2022' && matrix.config.cc == 'cl'
+        run: |
+          heat dir "${{ github.workspace }}/dist/${{ matrix.config.build_dir }}/usr/bin" -cg DLLFiles -gg -srd -sfrag -out DLLFiles.wxs
+          heat dir "${{ github.workspace }}/dist/${{ matrix.config.build_dir }}/usr/bin/generic" -cg GenericDLLFiles -gg -srd -sfrag -out GenericDLLFiles.wxs
+          heat dir "${{ github.workspace }}/dist/${{ matrix.config.build_dir }}/usr/share/icons/breeze" -cg IconFiles -gg -srd -sfrag -out IconFiles.wxs
         shell: cmd
+      - name: Build MSI
         run: |
-          echo %PATH%
-
-          heat dir dist/${{ matrix.config.build_dir }}/usr/bin -cg DLLFiles -gg -srd -sfrag -var var.DLLFiles -out DLLFiles.wxs
-          heat dir dist/${{ matrix.config.build_dir }}/usr/bin/generic -cg GenericDLLFiles -gg -srd -sfrag -var var.GenericDLLFiles -out GenericDLLFiles.wxs
-          heat dir dist/${{ matrix.config.build_dir }}/usr/share/icons/breeze -cg IconFiles -gg -srd -sfrag -var var.IconFiles -out IconFiles.wxs
-
-          wix build qtedit4.wxs DLLFiles.wxs GenericDLLFiles.wxs IconFiles.wxs -out dist/qtedit4.msi
+          wix build qtedit4.wxs DLLFiles.wxs GenericDLLFiles.wxs IconFiles.wxs -out dist/qtedit4.msi -d DLLFiles="${{ github.workspace }}/dist/${{ matrix.config.build_dir }}/usr/bin" -d GenericDLLFiles="${{ github.workspace }}/dist/${{ matrix.config.build_dir }}/usr/bin/generic" -d IconFiles="${{ github.workspace }}/dist/${{ matrix.config.build_dir }}/usr/share/icons/breeze"
+        shell: cmd
 
       - name: Upload MSI (Windows)
         if: matrix.config.os == 'windows-2022' && matrix.config.cc == 'cl'
diff --git a/qtedit4.wxs b/qtedit4.wxs
index dfe8b57..651f694 100644
--- a/qtedit4.wxs
+++ b/qtedit4.wxs
@@ -16,7 +16,7 @@
 
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
       <Component>
-        <File Source="dist\windows-msvc\usr\bin\qtedit4.exe" KeyPath="yes" />
+        <File Source="!(bindpath.DLLFiles)\qtedit4.exe" KeyPath="yes" />
       </Component>
     </ComponentGroup>
 
@@ -25,7 +25,7 @@
     <!-- ComponentGroup Id="GenericDLLFiles" -->
     <!-- ComponentGroup Id="IconFiles" -->
 
-    <Icon Id="qtedit4Icon" SourceFile="dist\windows-msvc\usr\qtedit4.ico" />
+    <Icon Id="qtedit4Icon" SourceFile="!(bindpath.DLLFiles)\qtedit4.ico" />
 
     <StandardDirectory Id="DesktopFolder">
       <Component Id="DesktopShortcut" Guid="*">