diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 345df95..25822bb 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -53,6 +53,7 @@ jobs:
           mkdir work/install
           Copy-Item -Recurse -Verbose syng work/install/syng
           Copy-Item -Verbose requirements-client.txt work/install/requirements.txt
+          Copy-Item -Verbose resources/windows/syng.wxs work/install/syng.wxs
           Copy-Item -Verbose resources/icons/syng.ico work/install/
           Copy-Item -Verbose syng/static/background.png work/install/
           Copy-Item -Verbose syng/static/background20perc.png work/install/
@@ -85,8 +86,18 @@ jobs:
 
       - name: Bundle Syng (install)
         run:
-          pyinstaller  -D -w -i'.\syng.ico' --add-data='.\syng.ico;.' --add-data='.\background.png;.' --add-data='.\background20perc.png;.' --add-binary '.\libmpv-2.dll;.' --add-binary '.\ffmpeg.exe;.' -n syng syng/main.py
+          pyinstaller  -D --contents-directory data -w -i'.\syng.ico' --add-data='.\syng.ico;.' --add-data='.\background.png;.' --add-data='.\background20perc.png;.' --add-binary '.\libmpv-2.dll;.' --add-binary '.\ffmpeg.exe;.' -n syng syng/main.py
         working-directory: ./work/install
+      
+      # build msi
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v2
+      - name: Install WiX
+        run: dotnet tool install --global wix
+      - name: Build WiX on Windows
+        run: wix build .\syng.wxs
+        working-directory: ./work/install
+
 
       - name: Upload artifact (portable)
         uses: actions/upload-artifact@v4
@@ -97,5 +108,5 @@ jobs:
       - name: Upload artifact (install)
         uses: actions/upload-artifact@v4
         with:
-          name: Syng Version ${{ env.VERSION }}
-          path: work/install/dist
+          name: Syng Version ${{ env.VERSION }} Installer
+          path: work/install/syng.msi
diff --git a/resources/windows/syng.wxs b/resources/windows/syng.wxs
new file mode 100644
index 0000000..7e5a68f
--- /dev/null
+++ b/resources/windows/syng.wxs
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Package Language="1033"
+             Manufacturer="Syng Rocks"
+             Name="Syng"
+             Scope="perUserOrMachine"
+             UpgradeCode="092e7e0b-5042-47a1-9673-544d9722f8df"
+             Version="2.1.0">
+        <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
+        <Icon Id="syng.ico" SourceFile="syng.ico"/>
+        <Property Id="ARPPRODUCTICON" Value="syng.ico" />
+        <StandardDirectory Id="TARGETDIR">
+            <Directory Id="ProgramFilesFolder">
+                <Directory Id="INSTALLFOLDER" Name="syng">
+                    <Component Id="ProductComponent">
+                        <File KeyPath="yes" Source="dist\syng.exe" Name="syng.exe"></File>
+                        <Shortcut Id="startmenuShortcut"
+                                  Directory="ProgramMenuDir"
+                                  Name="syng"
+                                  WorkingDirectory='INSTALLFOLDER'
+                                  Icon="syng.ico"
+                                  IconIndex="0"
+                                  Advertise="yes" />
+                        <Shortcut Id="desktopShortcut"
+                                  Directory="DesktopFolder"
+                                  Name="syng"
+                                  WorkingDirectory='INSTALLFOLDER'
+                                  Icon="syng.ico"
+                                  IconIndex="0"
+                                  Advertise="yes" />
+                    </Component>
+                    <Directory Name="data">
+                        <Files Include="dist\data\**">
+                        </Files>
+                    </Directory>
+                </Directory>
+            </Directory>
+        </StandardDirectory>
+        <Directory Id="ProgramMenuFolder" Name="Programs">
+            <Directory Id="ProgramMenuDir" Name="syng"/>
+        </Directory>
+        <StandardDirectory Id="DesktopFolder"/>
+        <Feature Id="syng">
+            <ComponentRef Id="ProductComponent" />
+        </Feature></Package>
+</Wix>