diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7593cd..ce3a9f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,7 +60,9 @@ jobs:
 
       - name: Build
         working-directory: ${{github.workspace}}/build
-        run: cmake --build . --config $BUILD_TYPE --parallel
+        run: |
+          cmake --build . --config $BUILD_TYPE --target MinecraftPE --parallel
+          cmake --build . --config $BUILD_TYPE --target MinecraftPE-server --parallel
       
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
@@ -287,6 +289,12 @@ jobs:
         with:
           files: mcpe-windows/MinecraftPE.exe mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/libz.dll
           dest: minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
+        
+      - name: Zip Windows Server Artifacts
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: mcpe-windows/MinecraftPE-server.exe
+          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}-windows.zip
 
       - name: Zip Linux Artifacts
         uses: vimtor/action-zip@v1.2
@@ -298,13 +306,7 @@ jobs:
         uses: vimtor/action-zip@v1.2
         with:
           files: mcpe-linux/MinecraftPE-server
-          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
-          
-      - name: Zip Windows Server Artifacts
-        uses: vimtor/action-zip@v1.2
-        with:
-          files: mcpe-windows/MinecraftPE-server.exe
-          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
+          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}-linux.zip
 
       - name: Zip Android arm64-v8a Artifact
         uses: vimtor/action-zip@v1.2
@@ -343,8 +345,9 @@ jobs:
           files: |
             ./data.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
+            ./minecraftpe-server-${{ steps.ref.outputs.hash }}-windows.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
-            ./minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
+            ./minecraftpe-server-${{ steps.ref.outputs.hash }}-linux.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-web.zip
\ No newline at end of file