diff --git a/.github/workflows/carbonix_build.yml b/.github/workflows/carbonix_build.yml
index 6fe6bfa8fc..816fe59ba3 100644
--- a/.github/workflows/carbonix_build.yml
+++ b/.github/workflows/carbonix_build.yml
@@ -246,15 +246,25 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.ccache
-          key: ${{github.workflow}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-          restore-keys: ${{github.workflow}}-ccache-  # restore ccache from either previous build on this branch or on master
+          key: ${{github.workflow}}-ccache-${{ matrix.toolchain }}-${{ matrix.gcc }}-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+          restore-keys: ${{github.workflow}}-ccache-${{ matrix.toolchain }}-${{ matrix.gcc }}  # restore ccache from either previous build on this branch or on master
       - name: setup ccache
         run: |
           . .github/workflows/ccache.env
 
       - name: build
         shell: bash
-        run: Tools/Carbonix_scripts/carbonix_waf_build.sh
+        run: |
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
+          if [[ ${{ matrix.toolchain }} == "chibios-clang" ]]; then
+            export CC=clang
+            export CXX=clang++
+          fi
+          PATH="/usr/lib/ccache:/opt/gcc-arm-none-eabi-${{matrix.gcc}}/bin:$PATH"
+          PATH="/github/home/.local/bin:$PATH"
+          Tools/Carbonix_scripts/carbonix_waf_build.sh
+          ccache -s
+          ccache -z
 
       - name: Check build files
         id: check_files