diff --git a/Dockerfile b/Dockerfile
index 00761ac..7f3b829 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,9 @@ RUN chmod 755 /sync-server.js
 COPY startup.sh /startup.sh
 RUN chmod +x /startup.sh
 
+# Ensure workspace dir exists with correct ownership before switching user
+RUN mkdir -p /home/project && (chown -R theia:theia /home/project 2>/dev/null || chmod 777 /home/project)
+
 EXPOSE 3000 3001
 
 USER theia