diff --git a/frontend/next.config.ts b/frontend/next.config.ts
index 9fe018e..ea22830 100644
--- a/frontend/next.config.ts
+++ b/frontend/next.config.ts
@@ -25,6 +25,14 @@ const withBundleAnalyzer = initializeBundleAnalyzer({
  * Standalone/HA modes use REST API pattern via /api/* rewrites.
  * Appwrite mode uses native Appwrite SDK (no backend API needed).
  */
+// Debug: Log environment variables during build
+console.log('[next.config.ts] Build-time environment check:');
+console.log('  APPWRITE_SITE_API_ENDPOINT:', process.env.APPWRITE_SITE_API_ENDPOINT || 'NOT SET');
+console.log('  APPWRITE_SITE_PROJECT_ID:', process.env.APPWRITE_SITE_PROJECT_ID || 'NOT SET');
+console.log('  APPWRITE_ENDPOINT:', process.env.APPWRITE_ENDPOINT || 'NOT SET');
+console.log('  APPWRITE_PROJECT_ID:', process.env.APPWRITE_PROJECT_ID || 'NOT SET');
+console.log('  DEPLOYMENT_MODE:', process.env.DEPLOYMENT_MODE || 'NOT SET');
+
 const isAppwriteSite = !!(
     process.env.APPWRITE_SITE_API_ENDPOINT ||
     process.env.APPWRITE_SITE_PROJECT_ID ||
@@ -36,6 +44,9 @@ const isStandalone = deploymentMode === 'standalone';
 const isHomeAssistant = deploymentMode === 'homeassistant';
 const isAppwrite = deploymentMode === 'appwrite';
 
+console.log('[next.config.ts] Detected deployment mode:', deploymentMode);
+console.log('[next.config.ts] Will use output:', isAppwrite ? 'DEFAULT (no standalone)' : 'standalone');
+
 // Only standalone and HA modes need the appwrite stub (no direct SDK usage)
 const require = createRequire(import.meta.url);
 const standaloneAppwriteAlias = require.resolve('./src/lib/appwrite-standalone');
diff --git a/frontend/package.json b/frontend/package.json
index 493557b..b53e76a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -12,7 +12,7 @@
         "dev": "next dev --turbopack",
         "build": "next build --turbopack",
         "postbuild": "if [ -d .next/standalone ]; then cp -r .next/static .next/standalone/.next/static && if [ -d public ]; then cp -r public .next/standalone/public; fi; fi",
-        "start": "node .next/standalone/server.js",
+        "start": "if [ -f .next/standalone/server.js ]; then node .next/standalone/server.js; else next start; fi",
         "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"",
         "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\"",
         "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"",