diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 4359fd261ea..68c5a9901de 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -44,11 +44,13 @@ jobs:
           key: ${{ github.repository }}-turbo-cache
           path: ./.turbo
 
-      - name: Mount Next.js build cache (Sticky Disk)
-        uses: useblacksmith/stickydisk@v1
+      - name: Restore Next.js build cache
+        uses: actions/cache@v5
         with:
-          key: ${{ github.repository }}-nextjs-cache
           path: ./apps/sim/.next/cache
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('bun.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-nextjs-
 
       - name: Install dependencies
         run: bun install --frozen-lockfile
diff --git a/apps/sim/next.config.ts b/apps/sim/next.config.ts
index 68ad3b37fa7..8d750b386e5 100644
--- a/apps/sim/next.config.ts
+++ b/apps/sim/next.config.ts
@@ -98,7 +98,6 @@ const nextConfig: NextConfig = {
   experimental: {
     optimizeCss: true,
     preloadEntriesOnStart: false,
-    turbopackFileSystemCacheForBuild: true,
     optimizePackageImports: [
       'lodash',
       'framer-motion',