diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs
index 8637c1b..86f3fc9 100644
--- a/apps/web/next.config.mjs
+++ b/apps/web/next.config.mjs
@@ -54,4 +54,11 @@ const withMDX = createMDX({});
 
 // Clean, standard wrapper application
 // Rewrites are now handled by src/middleware.ts for maximum robustness
-export default withPayload(withMintelConfig(withMDX(nextConfig)));
+const config = withMintelConfig(withMDX(nextConfig));
+
+// Cleanup config to prevent Next.js 16 warnings about deprecated keys
+if (config.serverActions) {
+  delete config.serverActions;
+}
+
+export default withPayload(config);
diff --git a/apps/web/payload.config.ts b/apps/web/payload.config.ts
index bf4d4cb..c2a2155 100644
--- a/apps/web/payload.config.ts
+++ b/apps/web/payload.config.ts
@@ -28,7 +28,8 @@ const dirname = path.dirname(filename);
 
 const isCLI =
   process.argv.includes("migrate") ||
-  process.argv.includes("generate:importmap");
+  process.argv.includes("generate:importmap") ||
+  process.argv.includes("build");
 let aiPlugin: any;
 if (!isCLI) {
   const { payloadChatPlugin } = await import("@mintel/payload-ai");
@@ -67,19 +68,21 @@ export default buildConfig({
   globals: [
     /* AiSettings as any */
   ],
-  email: nodemailerAdapter({
-    defaultFromAddress: process.env.MAIL_FROM || "info@mintel.me",
-    defaultFromName: "Mintel.me",
-    transportOptions: {
-      host: process.env.MAIL_HOST || "localhost",
-      port: parseInt(process.env.MAIL_PORT || "587", 10),
-      auth: {
-        user: process.env.MAIL_USERNAME || "user",
-        pass: process.env.MAIL_PASSWORD || "pass",
-      },
-      ...(process.env.MAIL_HOST ? {} : { ignoreTLS: true }),
-    },
-  }),
+  email: isCLI
+    ? undefined
+    : nodemailerAdapter({
+        defaultFromAddress: process.env.MAIL_FROM || "info@mintel.me",
+        defaultFromName: "Mintel.me",
+        transportOptions: {
+          host: process.env.MAIL_HOST || "localhost",
+          port: parseInt(process.env.MAIL_PORT || "587", 10),
+          auth: {
+            user: process.env.MAIL_USERNAME || "user",
+            pass: process.env.MAIL_PASSWORD || "pass",
+          },
+          ...(process.env.MAIL_HOST ? {} : { ignoreTLS: true }),
+        },
+      }),
   editor: lexicalEditor({
     features: ({ defaultFeatures }) => [
       ...defaultFeatures,