diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index db504f82..143735e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,18 +31,16 @@ jobs:
         uses: actions/cache@v4
         with:
           path: dl/
-          key: dl-${{ matrix.platform }}-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
+          key: dl-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
           restore-keys: |
-            dl-${{ matrix.platform }}-${{ matrix.variant }}-
-            dl-${{ matrix.platform }}-
+            dl-${{ matrix.variant }}-
             dl-
       - name: Restore Cache of .ccache/
         uses: actions/cache@v4
         with:
           path: .ccache/
-          key: ccache-${{ matrix.platform }}-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
+          key: ccache-${{ matrix.platform }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
           restore-keys: |
-            ccache-${{ matrix.platform }}-${{ matrix.variant }}-
             ccache-${{ matrix.platform }}-
             ccache-
       - name: Configure & Build
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index 41e1cf61..201891b9 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -31,18 +31,16 @@ jobs:
         uses: actions/cache@v4
         with:
           path: dl/
-          key: dl-x86_64-netconf-${{ hashFiles('.git/modules/buildroot/refs/heads/master', 'package/*/*.hash') }}
+          key: dl-netconf-${{ hashFiles('.git/modules/buildroot/refs/heads/master', 'package/*/*.hash') }}
           restore-keys: |
-            dl-x86_64-netconf-
-            dl-x86_64-
+            dl-netconf-
             dl-
       - name: Restore Cache of .ccache/
         uses: actions/cache@v4
         with:
           path: .ccache/
-          key: ccache-x86_64-netconf-${{ hashFiles('.git/modules/buildroot/refs/head/master', 'package/*/*.hash') }}
+          key: ccache-x86_64-${{ hashFiles('.git/modules/buildroot/refs/head/master', 'package/*/*.hash') }}
           restore-keys: |
-            ccache-x86_64-netconf-
             ccache-x86_64-
             ccache-
       - name: Configure NETCONF
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a6419ec9..bfbf7174 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,18 +55,16 @@ jobs:
         uses: actions/cache@v4
         with:
           path: dl/
-          key: dl-${{ matrix.platform }}-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
+          key: dl-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'configs/*', 'package/*/*.hash') }}
           restore-keys: |
-            dl-${{ matrix.platform }}-${{ matrix.variant }}-
-            dl-${{ matrix.platform }}-
+            dl-${{ matrix.variant }}-
             dl-
       - name: Restore Cache of .ccache/
         uses: actions/cache@v4
         with:
           path: .ccache/
-          key: ccache-${{ matrix.platform }}-${{ matrix.variant }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
+          key: ccache-${{ matrix.platform }}-${{ hashFiles('.git/modules/buildroot/HEAD', 'package/*/*.hash') }}
           restore-keys: |
-            ccache-${{ matrix.platform }}-${{ matrix.variant }}-
             ccache-${{ matrix.platform }}-
             ccache-
       - name: Configure & Build