diff --git a/packages/webapp/next.config.ts b/packages/webapp/next.config.ts
index c03a5d5fd3..82a3712616 100644
--- a/packages/webapp/next.config.ts
+++ b/packages/webapp/next.config.ts
@@ -1,4 +1,3 @@
-import { withSerwist } from '@serwist/turbopack';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import withBundleAnalyzerInit from '@next/bundle-analyzer';
 import { readFileSync } from 'fs';
@@ -59,6 +58,8 @@ const nextConfig: NextConfig = {
   },
   experimental: {
     turbopackFileSystemCacheForDev: false,
+    turbopackFileSystemCacheForBuild: true,
+    turbopackMemoryLimit: 4 * 1024 * 1024 * 1024,
   },
   ...withBundleAnalyzer({
     compiler: {
@@ -351,4 +352,4 @@ const nextConfig: NextConfig = {
   }),
 };
 
-export default withSerwist(nextConfig);
+export default nextConfig;
diff --git a/packages/webapp/package.json b/packages/webapp/package.json
index 2e62353b29..c3abb87994 100644
--- a/packages/webapp/package.json
+++ b/packages/webapp/package.json
@@ -9,7 +9,7 @@
     "dev:oss:turbo": "NEXT_PUBLIC_API_URL=http://localhost:5000 NEXT_PUBLIC_DOMAIN=localhost next dev --turbopack -p 5002",
     "dev:notls": "next dev -p 5002",
     "dev:notls:turbo": "next dev --turbopack -p 5002",
-    "build": "next build --webpack",
+    "build": "timeout --kill-after=30s --signal=SIGINT 10m next build --turbopack --experimental-debug-memory-usage",
     "build:turbo": "next build --turbopack",
     "build:notls": "NODE_TLS_REJECT_UNAUTHORIZED=0 pnpm run build",
     "start": "next start",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f5e1cf35fd..566633eb5b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14764,7 +14764,7 @@ snapshots:
   browserslist@4.28.2:
     dependencies:
       baseline-browser-mapping: 2.10.27
-      caniuse-lite: 1.0.30001791
+      caniuse-lite: 1.0.30001792
       electron-to-chromium: 1.5.351
       node-releases: 2.0.38
       update-browserslist-db: 1.2.3(browserslist@4.28.2)