diff --git a/.github/workflows/e2e-test2.yml b/.github/workflows/e2e-test2.yml
index 71114b9144d..1354368cd5a 100644
--- a/.github/workflows/e2e-test2.yml
+++ b/.github/workflows/e2e-test2.yml
@@ -53,7 +53,8 @@ jobs:
             target
             .buckd
             buck-out/cache
-          key: buck2-${{ runner.os }}-${{ matrix.target }}
+          key: b2-${{ matrix.target }}-${{ github.sha:(-4) }}
+          enableCrossOsArchive: true
 
   tests:
     name: execute via bats
@@ -81,7 +82,25 @@ jobs:
             target
             .buckd
             buck-out/cache
-          key: buck2-${{ runner.os }}-
+          key: |
+            b2-//core/api-${{ github.sha:(-4) }}
+            b2-//core/api-ws-server-${{ github.sha:(-4) }}
+            b2-//core/api-trigger-${{ github.sha:(-4) }}
+            b2-//core/api-exporter-${{ github.sha:(-4) }}
+            b2-//apps/dashboard-${{ github.sha:(-4) }}
+            b2-//apps/consent-${{ github.sha:(-4) }}
+            b2-//apps/pay-${{ github.sha:(-4) }}
+            b2-//apps/admin-panel-${{ github.sha:(-4) }}
+            b2-//apps/map-${{ github.sha:(-4) }}
+            b2-//apps/voucher-${{ github.sha:(-4) }}
+            b2-//core/api-keys-${{ github.sha:(-4) }}
+            b2-//core/notifications-${{ github.sha:(-4) }}
+            b2-//bats/helpers/callback:run-${{ github.sha:(-4) }}
+            b2-//bats/helpers/subscriber:run-${{ github.sha:(-4) }}
+            b2-//bats/helpers/totp:generate-${{ github.sha:(-4) }}
+          restore-keys: |
+            buck2-${{ runner.os }}-
+          fail-on-cache-miss: true
 
       - name: Run bats tests
         run: |