diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index ca51455..830212e 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -49,8 +49,24 @@ jobs:
           buildPreset: 'linux-release'
           testPreset: 'linux-release'
 
+      - name: Assemble Files
+        working-directory: ${{ github.workspace }}
+        run: scripts/ci/linux/assemble.sh
+
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: OpenStarbound-Dev-Linux-x86_64
-          path: dist/*
+          name: OpenStarbound-Linux
+          path: dist.tar
+
+      - name: Upload Client Files
+        uses: actions/upload-artifact@v4
+        with:
+          name: OpenStarbound-Linux-Client
+          path: client.tar
+
+      - name: Upload Server Files
+        uses: actions/upload-artifact@v4
+        with:
+          name: OpenStarbound-Linux-Server
+          path: server.tar
\ No newline at end of file
diff --git a/scripts/ci/linux/assemble.sh b/scripts/ci/linux/assemble.sh
index 5215591..f1c9fec 100644
--- a/scripts/ci/linux/assemble.sh
+++ b/scripts/ci/linux/assemble.sh
@@ -41,3 +41,7 @@ cp \
   scripts/ci/linux/run-server.sh \
   scripts/ci/linux/sbinit.config \
   server_distribution/linux/
+
+tar -cvf dist.tar dist
+tar -cvf client.tar client_distribution
+tar -cvf server.tar server_distribution