diff --git a/.github/workflows/e2e-test2.yml b/.github/workflows/e2e-test2.yml
index 71114b9144d..e05d1217d86 100644
--- a/.github/workflows/e2e-test2.yml
+++ b/.github/workflows/e2e-test2.yml
@@ -30,6 +30,9 @@ jobs:
       fail-fast: false
 
     steps:
+      - id: vars
+        run: echo "short_sha=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
+
       - uses: actions/checkout@v4
 
       - name: Install Nix
@@ -53,7 +56,8 @@ jobs:
             target
             .buckd
             buck-out/cache
-          key: buck2-${{ runner.os }}-${{ matrix.target }}
+          key: b2-${{ matrix.target }}-${{ env.short_sha }}
+          enableCrossOsArchive: true
 
   tests:
     name: execute via bats
@@ -62,6 +66,16 @@ jobs:
     needs: build
 
     steps:
+      - id: vars
+        run: echo "short_sha=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
+
+      - name: Maximize build space
+        uses: easimon/maximize-build-space@master
+        with:
+          root-reserve-mb: 15360
+          temp-reserve-mb: 12288
+          remove-dotnet: "true"
+
       - uses: actions/checkout@v4
 
       - name: Install Nix
@@ -81,7 +95,25 @@ jobs:
             target
             .buckd
             buck-out/cache
-          key: buck2-${{ runner.os }}-
+          key: |
+            b2-//core/api-${{ env.short_sha }}
+            b2-//core/api-ws-server-${{ env.short_sha }}
+            b2-//core/api-trigger-${{ env.short_sha }}
+            b2-//core/api-exporter-${{ env.short_sha }}
+            b2-//apps/dashboard-${{ env.short_sha }}
+            b2-//apps/consent-${{ env.short_sha }}
+            b2-//apps/pay-${{ env.short_sha }}
+            b2-//apps/admin-panel-${{ env.short_sha }}
+            b2-//apps/map-${{ env.short_sha }}
+            b2-//apps/voucher-${{ env.short_sha }}
+            b2-//core/api-keys-${{ env.short_sha }}
+            b2-//core/notifications-${{ env.short_sha }}
+            b2-//bats/helpers/callback:run-${{ env.short_sha }}
+            b2-//bats/helpers/subscriber:run-${{ env.short_sha }}
+            b2-//bats/helpers/totp:generate-${{ env.short_sha }}
+          restore-keys: |
+            b2-
+          fail-on-cache-miss: true
 
       - name: Run bats tests
         run: |