diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 258d73d9..fcd88f88 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,62 +36,57 @@ jobs:
             goal: build
             arch: x86_64
             openssl_archs: linux-x86_64
-          - os: ubuntu-20.04
-            jid: 2
-            goal: build
-            arch: x86_64
-            openssl_archs: linux-x86_64
           - os: [self-hosted, linux, arm64]
-            jid: 3
+            jid: 2
             goal: build
             arch: aarch64
             openssl_archs: linux-aarch64
-          - os: ubuntu-20.04
-            jid: 4
+          - os: ubuntu-22.04
+            jid: 3
             goal: build
             arch: x86_64
             openssl_archs: linux-x86_64
             staticx: yes
           - os: [self-hosted, linux, arm64]
-            jid: 5
+            jid: 4
             goal: build
             arch: aarch64
             openssl_archs: linux-aarch64
             staticx: yes
           - os: macos-13
-            jid: 6
+            jid: 5
             goal: build
             arch: x86_64
             openssl_archs: darwin64-x86_64
           - os: macos-14
-            jid: 7
+            jid: 6
             goal: build
             arch: aarch64
             openssl_archs: darwin64-arm64
           - os: windows-2022
-            jid: 9
+            jid: 7
             goal: build
             arch: Win64
             openssl_archs: VC-WIN64A
           - os: ubuntu-22.04
             goal: test
             python: "3.13"
-            jid: 10
+            jid: 8
             arch: x86_64
           - os: ubuntu-22.04
             goal: test
             python: "3.9"
-            jid: 11
+            jid: 9
             arch: x86_64
           - os: ubuntu-22.04
             goal: test
             python: "3.10"
-            jid: 12
+            jid: 10
             arch: x86_64
           - os: ubuntu-22.04
             goal: test
             python: "3.11"
-            jid: 8
+            jid: 11
             arch: x86_64
 
     steps:
@@ -115,7 +110,7 @@ jobs:
         with:
           path: |
             cache.tar.xz
-          key: gam-${{ matrix.jid }}-20241001
+          key: gam-${{ matrix.jid }}-20241002
 
       - name: Untar Cache archive
         if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit == 'true'