diff --git a/.github/workflows/mapbase_build-base.yml b/.github/workflows/mapbase_build-base.yml
index 8e9f9d34..7d47c601 100644
--- a/.github/workflows/mapbase_build-base.yml
+++ b/.github/workflows/mapbase_build-base.yml
@@ -47,13 +47,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: '3.13'
 
     - name: Add MSBuild to PATH
       uses: compnerd/gha-setup-vsdevenv@v6
 
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+
     - name: Pick game
       if: inputs.project-group == 'game' || inputs.project-group == 'shaders'
       working-directory: 'src'
@@ -85,6 +86,7 @@ jobs:
         name: '${{inputs.project-group}}_${{inputs.game}}_win32_${{ inputs.configuration }}'
         path: |
           game/mod_${{inputs.game}}/bin/*.dll
+          game/mod_${{inputs.game}}/bin/x64/*.dll
         if-no-files-found: error
 
     - name: Publish map tools
@@ -95,6 +97,8 @@ jobs:
         path: |
           game/bin/*.exe
           game/bin/*.dll
+          game/bin/x64/*.exe
+          game/bin/x64/*.dll
         if-no-files-found: error
 
     - name: Publish everything
@@ -104,7 +108,9 @@ jobs:
         name: 'everything_win32_${{ inputs.configuration }}'
         path: |
           game/bin
+          game/bin/x64
           game/mod_*/bin
+          game/mod_*/x64/bin
         if-no-files-found: error
 
   build_ubuntu:
@@ -122,6 +128,9 @@ jobs:
         sudo apt-get update
         sudo apt-get -y install podman python3
 
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2
+
     - name: Pick game
       if: inputs.project-group == 'game' || inputs.project-group == 'shaders'
       working-directory: 'src'
@@ -151,7 +160,9 @@ jobs:
         name: '${{inputs.project-group}}_${{inputs.game}}_linux32_${{ inputs.configuration }}'
         path: |
           game/mod_${{inputs.game}}/bin/*.so
+          game/mod_${{inputs.game}}/bin/linux64/*.so
           !game/mod_${{inputs.game}}/bin/*_srv.so
+          !game/mod_${{inputs.game}}/bin/linux64/*_srv.so
         if-no-files-found: error
 
     #- name: Publish map tools
@@ -175,8 +186,12 @@ jobs:
       with:
         name: 'everything_linux32_${{ inputs.configuration }}'
         path: |
+          game/bin/linux64/*.so
           game/bin/*.so
+          !game/bin/linux64/*_srv.so
           !game/bin/*_srv.so
+          game/mod_*/bin/linux64/*.so
           game/mod_*/bin/*.so
+          !game/mod_*/bin/linux64/*_srv.so
           !game/mod_*/bin/*_srv.so
         if-no-files-found: error