diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 50927758..b028690f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -203,14 +203,14 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/ccache
-          key: ${{matrix.platform}}
+          key: ${{matrix.platform}}_${{matrix.release}}
 
       - name: Restore ccache
         if: github.event_name == 'pull_request'
         uses: actions/cache/restore@v3
         with:
           path: /tmp/ccache
-          key: ${{matrix.platform}}
+          key: ${{matrix.platform}}_${{matrix.release}}
 
       - name: Build firmware
         run: |
diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
index 7a5c96da..cc1405b3 100644
--- a/.github/workflows/toolchain.yml
+++ b/.github/workflows/toolchain.yml
@@ -8,7 +8,7 @@ env:
 jobs:
   toolchain:
     name: Toolchain
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: false