diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml
index 92f9e2e1224ed..d6243439067f7 100644
--- a/.github/workflows/buildAndDeploy.yml
+++ b/.github/workflows/buildAndDeploy.yml
@@ -215,6 +215,40 @@ jobs:
             deploy/Unciv-Windows64.zip
             deploy/Unciv-Linux64.zip
 
+  build-msi:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4 # For the icon
+      
+      - name: Download packed zips
+        uses: actions/download-artifact@v4
+        with:
+          name: UncivDeploymentZips
+      
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Unzip unciv file
+        run: |
+           tar -xf Unciv-Windows64.zip -C files
+           dir files
+        
+      - name: Install WiX
+        run: dotnet tool install --global wix
+        
+      - name: Build WiX on Windows
+        shell: bash
+        run: |
+          UNCIV_VERSION=${{ github.ref_name }} wix build .github/workflows/unciv.wxs
+        
+      - name: Upload MSI
+        uses: actions/upload-artifact@v4
+        with:
+          name: Unciv-MSI
+          path: Unciv.msi
+          if-no-files-found: error
+
   upload-to-itch:
     runs-on: ubuntu-latest
     needs: [packr-build]
@@ -254,6 +288,7 @@ jobs:
           mv UncivDeploymentZips/Unciv-Linux64.zip deploy
           mv UncivAPK/Unciv-signed.apk deploy
           mv UncivServer/UncivServer.jar deploy
+          mv Unciv-MSI/Unciv.msi deploy
 
       - name: Check if this is a real release or a test version, for Github release
         id: check-version-tag
diff --git a/.github/workflows/unciv.wxs b/.github/workflows/unciv.wxs
new file mode 100644
index 0000000000000..e78b7208211f2
--- /dev/null
+++ b/.github/workflows/unciv.wxs
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- See the file's history at https://github.com/yairm210/unciv-wix-tests -->
+<?define Name = "Unciv" ?>
+<?define InstallFolder = "Unciv" ?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Package Language="1033"
+             Manufacturer="Yair Morgenstern"
+             Name="$(var.Name)"
+             Version="$(env.UNCIV_VERSION).0"
+            UpgradeCode="74d42802-054a-4869-a703-658c361fe94c">
+             <!-- MSI versions require a 4-part, so we add a ".0" to the end of every version -->
+        <Icon Id="icon.ico" SourceFile="extraImages/Icons/Unciv.ico"/>
+        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." Schedule="afterInstallInitialize" />
+
+        <!-- Pack all the files into the MSI instead of spreading this over .cab files -->
+        <MediaTemplate CompressionLevel="high" EmbedCab="yes" />
+
+        <DirectoryRef Id="INSTALLFOLDER">
+          <Component Id="Unciv" Guid="70aab056-7fbd-4a7a-9cbb-2275ee064f06">
+            <File Id="UncivExe"
+                  KeyPath="yes"
+                  Checksum="yes"
+                  Source="files/Unciv.exe">
+            </File>
+          </Component>
+        </DirectoryRef>
+    
+        <ComponentGroup Id="UncivFiles" Directory="INSTALLFOLDER">
+            <Files Include="files\**" />
+        </ComponentGroup>
+
+        <Component Id="UncivShortcuts" Directory="INSTALLFOLDER" Guid="0eac8b63-1cab-4645-b0cb-ad7535f0e9ce">
+          <Shortcut Id="StartMenuShortcut"
+                    Name="$(var.Name)"
+                    Target="[#UncivExe]"
+                    Arguments="--data-dir=%APPDATA%\$(var.InstallFolder)"
+                    Icon="icon.ico"
+                    Directory="ApplicationProgramsFolder"
+                    WorkingDirectory="INSTALLFOLDER" />
+          <RemoveFolder Id="CleanupStartMenuShortcut"
+                        Directory="ApplicationProgramsFolder"
+                        On="uninstall" />
+          <RemoveFolder Id="CleanupAppData"
+                        Directory="APPDATAFOLDER"
+                        On="uninstall" />
+          <RegistryValue Root="HKCU" Key="Software\YairMorgenstern\Unciv" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+        </Component>
+    
+        <Feature Id="ProductFeature" Title="$(var.Name)" Level="1" ConfigurableDirectory="INSTALLFOLDER">
+            <ComponentGroupRef Id="UncivFiles" />
+            <ComponentRef Id="Unciv" />
+            <ComponentRef Id="UncivShortcuts" />
+        </Feature>
+    
+
+        <StandardDirectory Id="ProgramFilesFolder">
+            <Directory Id="INSTALLFOLDER" Name="$(var.InstallFolder)" />
+        </StandardDirectory>
+
+        <StandardDirectory Id="AppDataFolder">
+            <Directory Id="APPDATAFOLDER" Name="$(var.InstallFolder)" />
+        </StandardDirectory>
+
+        <StandardDirectory Id="ProgramMenuFolder">
+          <Directory Id="ApplicationProgramsFolder" Name="$(var.InstallFolder)" />
+        </StandardDirectory>
+
+    </Package>
+</Wix>