diff --git a/docker/bootstrap.sh b/docker/bootstrap.sh
index a9224a7e..45e56927 100644
--- a/docker/bootstrap.sh
+++ b/docker/bootstrap.sh
@@ -109,9 +109,9 @@ else
     cd "$APP_DIR"
 fi
 
-# Start supervisor (manages PostgreSQL and Next.js)
-echo "▶ Starting services..."
-/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf &
+# Start PostgreSQL
+echo "▶ Starting PostgreSQL..."
+/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf --start postgresql &
 SUPERVISOR_PID=$!
 
 # Wait for PostgreSQL
@@ -130,9 +130,14 @@ done
 
 # Run migrations
 echo "▶ Running database migrations..."
+cd "$APP_DIR"
 npx prisma migrate deploy
 echo "✓ Migrations complete"
 
+# Start Next.js
+echo "▶ Starting Next.js..."
+/usr/bin/supervisorctl -c /etc/supervisor/conf.d/supervisord.conf start nextjs
+
 # Seed on first run only
 SEED_MARKER="/data/.seeded"
 if [ ! -f "$SEED_MARKER" ]; then
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
index f8e165ee..25d4fbf6 100644
--- a/docker/supervisord.conf
+++ b/docker/supervisord.conf
@@ -18,7 +18,7 @@ stderr_logfile=/var/log/supervisor/postgresql-error.log
 command=node /data/app/.next/standalone/server.js
 directory=/data/app
 user=root
-autostart=true
+autostart=false
 autorestart=true
 priority=20
 startsecs=10