diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f6a12bf4..fc003283 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,11 +56,11 @@ jobs:
             tools/
             zephyr/
             bootloader/
-          key: 2-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
           restore-keys: |
-            2-${{ runner.os }}-build-${{ env.cache-name }}-
-            2-${{ runner.os }}-build-
-            2-${{ runner.os }}-
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: West Init
         uses: "docker://zmkfirmware/zephyr-west-action-arm:latest"
         id: west-init
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f3e93515..d3521e9b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,11 +31,11 @@ jobs:
             tools/
             zephyr/
             bootloader/
-          key: 2-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('app/west.yml') }}
           restore-keys: |
-            2-${{ runner.os }}-build-${{ env.cache-name }}-
-            2-${{ runner.os }}-build-
-            2-${{ runner.os }}-
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - name: West Init
         uses: "docker://zmkfirmware/zephyr-west-action-arm:latest"
         id: west-init