diff --git a/CloudronManifest.json b/CloudronManifest.json
index 147125a..ad642b5 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -27,7 +27,7 @@
   "minBoxVersion": "7.0.0",
   "maxBoxVersion": "9.0.0",
   "memoryLimit": 512000000,
-  "optionalSso": true,
+  "optionalSso": false,
   "mediaLinks": [
     "https://docmost.com",
     "https://github.com/docmost/docmost"
diff --git a/start.sh b/start.sh
index c73dd47..f5a310c 100644
--- a/start.sh
+++ b/start.sh
@@ -46,11 +46,8 @@ export MAIL_FROM_ADDRESS="${CLOUDRON_MAIL_FROM}"
 export STORAGE_DRIVER=local
 export STORAGE_LOCAL_PATH="/app/data/uploads"
 
-# OIDC configuration for Cloudron authentication
-export OIDC_CLIENT_ID="${CLOUDRON_OIDC_CLIENT_ID}"
-export OIDC_CLIENT_SECRET="${CLOUDRON_OIDC_CLIENT_SECRET}"
-export OIDC_ISSUER="${CLOUDRON_OIDC_ISSUER}"
-export OIDC_REDIRECT_URI="${CLOUDRON_APP_ORIGIN}/api/v1/session/callback"
+# Authentication will use built-in email/password system
+echo "=> Using built-in email/password authentication"
 
 # File upload configuration
 export FILE_UPLOAD_SIZE_LIMIT="50mb"
diff --git a/supervisord.conf b/supervisord.conf
index f59f3b3..4af922f 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -15,7 +15,7 @@ autorestart=true
 priority=100
 
 [program:docmost]
-command=/usr/bin/sudo -u cloudron /usr/bin/node /app/code/apps/server/dist/main.js
+command=/usr/bin/sudo -u cloudron /usr/bin/pnpm start:server
 directory=/app/code
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0