diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 37cfb46..88c7ff6 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -55,15 +55,27 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: scripts\ci\windows\post_build.bat
 
+      - name: Assemble Files
+        working-directory: ${{ github.workspace }}
+        run: scripts\ci\windows\assemble.bat
+
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: OpenStarbound-Dev-Windows-x64
+          name: OpenStarbound-Windows
           path: dist/*
 
-      - name: Assemble Install Files
-        working-directory: ${{ github.workspace }}
-        run: scripts\ci\windows\assemble.bat
+      - name: Upload Client
+        uses: actions/upload-artifact@v4
+        with:
+          name: OpenStarbound-Windows-Client
+          path: client_distribution/*
+
+      - name: Upload Server
+        uses: actions/upload-artifact@v4
+        with:
+          name: OpenStarbound-Windows-Server
+          path: server_distribution/*
 
       - name: Create Installer
         working-directory: ${{ github.workspace }}
diff --git a/.gitignore b/.gitignore
index 969b5a0..e359520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 /mac/
 /dist/
 /installer/
+/client_distribution/
+/server_distribution/
 enc_temp_folder/
 .cache/
 /attic/user/
diff --git a/scripts/ci/linux/assemble.sh b/scripts/ci/linux/assemble.sh
index f1c9fec..5a7cc82 100755
--- a/scripts/ci/linux/assemble.sh
+++ b/scripts/ci/linux/assemble.sh
@@ -2,9 +2,9 @@
 
 mkdir client_distribution
 mkdir client_distribution/assets
+mkdir client_distribution/assets/user
 
 ./dist/asset_packer -c scripts/packing.config assets/opensb client_distribution/assets/opensb.pak
-cp -r assets/user client_distribution/assets/
 
 mkdir client_distribution/mods
 touch client_distribution/mods/mods_go_here
diff --git a/scripts/ci/macos/assemble.sh b/scripts/ci/macos/assemble.sh
index 8858cf4..e60b2c0 100755
--- a/scripts/ci/macos/assemble.sh
+++ b/scripts/ci/macos/assemble.sh
@@ -2,9 +2,9 @@
 
 mkdir client_distribution
 mkdir client_distribution/assets
+mkdir client_distribution/assets/user
 
 ./dist/asset_packer -c scripts/packing.config assets/opensb client_distribution/assets/opensb.pak
-cp -r assets/user client_distribution/assets/
 
 mkdir client_distribution/mods
 touch client_distribution/mods/mods_go_here
diff --git a/scripts/ci/windows/assemble.bat b/scripts/ci/windows/assemble.bat
index ca79522..4bda92b 100644
--- a/scripts/ci/windows/assemble.bat
+++ b/scripts/ci/windows/assemble.bat
@@ -1,18 +1,27 @@
 @echo off
-set dst=windows
+set client=client_distribution
+if exist %client% rmdir %client% /S /Q
 
-if exist %dst% rmdir %dst% /S /Q
+mkdir %client%
+mkdir %client%\storage
+mkdir %client%\mods
+mkdir %client%\assets
+mkdir %client%\win
 
-mkdir %dst%
-mkdir %dst%\storage
-mkdir %dst%\mods
-mkdir %dst%\assets
+.\dist\asset_packer.exe -c scripts\packing.config assets\opensb %client%\assets\opensb.pak
 
-set bin=%dst%\win
-mkdir %bin%
+set server=server_distribution
+if exist %server% rmdir %server% /S /Q
+xcopy %client% %server% /E /I
 
-.\dist\asset_packer.exe -c scripts\packing.config assets\opensb %dst%\assets\opensb.pak
+for /f "delims=" %%f in (scripts\ci\windows\files_client.txt) do (
+    xcopy "%%f" "%client%\win\" /Y
+)
 
-for /f "delims=" %%f in (scripts\ci\windows\files.txt) do (
-    xcopy "%%f" "%bin%\" /Y
-)
\ No newline at end of file
+for /f "delims=" %%f in (scripts\ci\windows\files_server.txt) do (
+    xcopy "%%f" "%server%\win\" /Y
+)
+
+set win=windows
+xcopy %client% %win% /E /I /Y
+xcopy %server% %win% /E /I /Y
\ No newline at end of file
diff --git a/scripts/ci/windows/files.txt b/scripts/ci/windows/files_client.txt
similarity index 83%
rename from scripts/ci/windows/files.txt
rename to scripts/ci/windows/files_client.txt
index bb05cea..48b5560 100644
--- a/scripts/ci/windows/files.txt
+++ b/scripts/ci/windows/files_client.txt
@@ -5,8 +5,6 @@ dist\asset_unpacker.exe
 dist\asset_packer.exe
 dist\starbound.exe
 dist\starbound.pdb
-dist\starbound_server.exe
-dist\starbound_server.pdb
 dist\*.dll
 lib\windows\discord_game_sdk.dll
 lib\windows\steam_api64.dll
diff --git a/scripts/ci/windows/files_server.txt b/scripts/ci/windows/files_server.txt
new file mode 100644
index 0000000..cb15ef4
--- /dev/null
+++ b/scripts/ci/windows/files_server.txt
@@ -0,0 +1,4 @@
+dist\btree_repacker.exe
+dist\starbound_server.exe
+dist\starbound_server.pdb
+scripts\ci\windows\sbinit.config
\ No newline at end of file