diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c350c3170..bb34016d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -59,10 +59,13 @@ jobs:
           prerelease: true
           title: "Latest Preview Build"
           files: |
+            ./artifacts/duckstation-windows-x64-installer.exe
             ./artifacts/duckstation-windows-x64-release.zip
             ./artifacts/duckstation-windows-x64-release-symbols.zip
+            ./artifacts/duckstation-windows-x64-sse2-installer.exe
             ./artifacts/duckstation-windows-x64-sse2-release.zip
             ./artifacts/duckstation-windows-x64-sse2-release-symbols.zip
+            ./artifacts/duckstation-windows-arm64-installer.exe
             ./artifacts/duckstation-windows-arm64-release.zip
             ./artifacts/duckstation-windows-arm64-release-symbols.zip
             ./artifacts/DuckStation-x64.AppImage
@@ -82,10 +85,13 @@ jobs:
           prerelease: false
           title: "Latest Rolling Release"
           files: |
+            ./artifacts/duckstation-windows-x64-installer.exe
             ./artifacts/duckstation-windows-x64-release.zip
             ./artifacts/duckstation-windows-x64-release-symbols.zip
+            ./artifacts/duckstation-windows-x64-sse2-installer.exe
             ./artifacts/duckstation-windows-x64-sse2-release.zip
             ./artifacts/duckstation-windows-x64-sse2-release-symbols.zip
+            ./artifacts/duckstation-windows-arm64-installer.exe
             ./artifacts/duckstation-windows-arm64-release.zip
             ./artifacts/duckstation-windows-arm64-release-symbols.zip
             ./artifacts/DuckStation-x64.AppImage
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 40c1444f1..b33431be2 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -22,7 +22,10 @@ jobs:
             platform: "x64"
             bindir: "x64"
             assetname: "duckstation-windows-x64-release.zip"
+            installerassetname: "duckstation-windows-x64-installer.exe"
             updatername: "updater-x64-ReleaseLTCG.exe"
+            installername: "installer-x64-ReleaseLTCG.exe"
+            uninstallername: "uninstaller-x64-ReleaseLTCG.exe"
           - name: "x64 SSE2"
             arch: "x64-sse2"
             vcvars: "x64"
@@ -30,7 +33,10 @@ jobs:
             platform: "x64"
             bindir: "x64"
             assetname: "duckstation-windows-x64-sse2-release.zip"
+            installerassetname: "duckstation-windows-x64-sse2-installer.exe"
             updatername: "updater-x64-ReleaseLTCG-SSE2.exe"
+            installername: "installer-x64-ReleaseLTCG-SSE2.exe"
+            uninstallername: "uninstaller-x64-ReleaseLTCG-SSE2.exe"
           - name: "ARM64"
             arch: "arm64"
             vcvars: "amd64_arm64"
@@ -38,7 +44,10 @@ jobs:
             platform: "ARM64"
             bindir: "ARM64"
             assetname: "duckstation-windows-arm64-release.zip"
+            installerassetname: "duckstation-windows-arm64-installer.exe"
             updatername: "updater-ARM64-ReleaseLTCG.exe"
+            installername: "installer-ARM64-ReleaseLTCG.exe"
+            uninstallername: "uninstaller-ARM64-ReleaseLTCG.exe"
     steps:
     - uses: actions/checkout@v6
       with:
@@ -111,15 +120,28 @@ jobs:
       shell: cmd
       run: |
         del /Q bin\${{ matrix.bindir }}\*.pdb bin\${{ matrix.bindir }}\*.exp bin\${{ matrix.bindir }}\*.lib bin\${{ matrix.bindir }}\*.iobj bin\${{ matrix.bindir }}\*.ipdb bin\${{ matrix.bindir }}\common-tests*
+
+    - name: Rename Updater and Installer Programs
+      shell: cmd
+      run: |
         rename bin\${{ matrix.bindir }}\${{ matrix.updatername }} updater.exe
+        rename bin\${{ matrix.bindir }}\${{ matrix.uninstallername }} uninstaller.exe
+        move bin\${{ matrix.bindir }}\${{ matrix.installername }} ${{ matrix.installerassetname }}.tmp
 
     - name: Create ${{ matrix.name }} Release Archive
       shell: cmd
       run: |
         "C:\Program Files\7-Zip\7z.exe" a -mx9 -r ${{ matrix.assetname }} ./bin/${{ matrix.bindir }}/*
 
-    - name: Upload ${{ matrix.name }} Release Artifact
+    - name: Create ${{ matrix.name }} Installer Archive
+      shell: cmd
+      run: |
+        "C:\Program Files\7-Zip\7z.exe" a -mx9 -r installer.7z ./bin/${{ matrix.bindir }}/*
+        copy /B ${{ matrix.installerassetname }}.tmp + installer.7z ${{ matrix.installerassetname }}
+        del /Q ${{ matrix.installerassetname }}.tmp
+
+    - name: Upload ${{ matrix.name }} Artifacts
       uses: actions/upload-artifact@v6
       with:
         name: "windows-${{ matrix.arch }}"
-        path: "duckstation-windows-${{ matrix.arch }}-*.zip"
+        path: "duckstation-windows-${{ matrix.arch }}-*.*"