diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh
index d314b0c6..87c074b6 100644
--- a/contrib/msi/build-msi.sh
+++ b/contrib/msi/build-msi.sh
@@ -102,6 +102,10 @@ cat > wix.xml << EOF
       Cabinet="Media.cab"
       EmbedCab="yes" />
 
+    <Binary
+      Id='config.bat'
+      SourceFile='config.bat' />
+
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="${PKGINSTFOLDER}" Name="PFiles">
         <Directory Id="YggdrasilInstallFolder" Name="Yggdrasil">
@@ -143,15 +147,6 @@ cat > wix.xml << EOF
               Source="yggdrasilctl.exe"
               KeyPath="yes"/>
           </Component>
-
-          <Component Id="ConfigScript" Guid="64a3733b-c98a-4732-85f3-20cd7da1a785">
-            <File
-              Id="Configbat"
-              Name="config.bat"
-              DiskId="1"
-              Source="config.bat"
-              KeyPath="yes"/>
-          </Component>
         </Directory>
       </Directory>
 
@@ -161,21 +156,20 @@ cat > wix.xml << EOF
     <Feature Id="Complete" Level="1">
       <ComponentRef Id="MainExecutable" />
       <ComponentRef Id="CtrlExecutable" />
-      <ComponentRef Id="ConfigScript" />
       <MergeRef Id="Wintun" />
     </Feature>
 
     <CustomAction
       Id="UpdateGenerateConfig"
       Directory="YggdrasilInstallFolder"
-      ExeCommand="config.bat"
-      Execute="commit"
+      BinaryKey="config.bat"
+      Execute="immediate"
       Return="asyncWait"/>
 
     <InstallExecuteSequence>
       <Custom
         Action="UpdateGenerateConfig"
-        Before="MsiConfigureServices" />
+        Before="InstallFiles" />
     </InstallExecuteSequence>
 
   </Product>