diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs
index 0756e4c9c..869b46017 100644
--- a/apps/web/next.config.mjs
+++ b/apps/web/next.config.mjs
@@ -94,12 +94,12 @@ const nextConfig = {
   transpilePackages: ['shiki'],
   // ESLint configuration
   eslint: {
-    ignoreDuringBuilds: false,
+    ignoreDuringBuilds: process.env.NEXT_DISABLE_LINT === 'true' || process.env.CI === 'true',
     dirs: ['src']
   },
   // Disable TypeScript type checking during builds
   typescript: {
-    ignoreBuildErrors: false
+    ignoreBuildErrors: process.env.NEXT_DISABLE_TS_CHECK === 'true'
   },
   sassOptions: {
     includePaths: [path.join(__dirname, 'styles')],