diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6c4f9c7d..1d79c7a2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,7 +11,7 @@ RUN npm run build
 FROM node:18-alpine AS backend-builder
 WORKDIR /app
 COPY package*.json ./
-RUN npm ci --only=production --force && \
+RUN npm ci --force && \
     npm cache clean --force
 COPY src/backend/ ./src/backend/
 
@@ -49,9 +49,12 @@ ENV DEBIAN_FRONTEND=noninteractive \
     MONGODB_LOG_DIR=/var/log/mongodb \
     PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
-# Create users first
-RUN groupadd -r mongodb && useradd -r -g mongodb mongodb \
-    && groupadd -r node && useradd -r -g node -m node
+# Create users and set up directories first
+RUN groupadd -r mongodb && useradd -r -g mongodb mongodb && \
+    groupadd -r node && useradd -r -g node -m node && \
+    mkdir -p /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb && \
+    chown -R mongodb:mongodb /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb && \
+    chmod 755 /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb
 
 # Install all dependencies in one layer
 RUN rm -f /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/lock* && \
@@ -62,7 +65,8 @@ RUN rm -f /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/loc
         gnupg \
         gosu \
         nginx-light \
-        wget && \
+        wget \
+        curl && \
     wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - && \
     echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
     wget -qO- https://deb.nodesource.com/setup_${NODE_VERSION} | bash - && \
@@ -72,27 +76,28 @@ RUN rm -f /var/lib/apt/lists/lock /var/cache/apt/archives/lock /var/lib/dpkg/loc
         mongodb-org-server=${MONGO_VERSION} \
         mongodb-org-shell=${MONGO_VERSION} && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/* /tmp/* && \
-    mkdir -p /data/db /var/log/mongodb /var/run/mongodb && \
-    chown -R mongodb:mongodb /data/db /var/log/mongodb /var/run/mongodb && \
-    chmod 755 /data/db /var/log/mongodb /var/run/mongodb
+    rm -rf /var/lib/apt/lists/* /var/cache/apt/* /tmp/*
 
 # Setup nginx and frontend
 COPY docker/nginx.conf /etc/nginx/nginx.conf
 COPY --from=frontend-builder /app/dist /usr/share/nginx/html
-RUN chown -R www-data:www-data /usr/share/nginx/html
+RUN chown -R www-data:www-data /usr/share/nginx/html && \
+    mkdir -p /var/log/nginx && \
+    chown -R www-data:www-data /var/log/nginx && \
+    chmod 755 /var/log/nginx
 
 # Setup backend
 WORKDIR /app
 COPY package*.json ./
-RUN npm ci --only=production --ignore-scripts --force && \
+RUN npm ci --only=production --force && \
     npm cache clean --force && \
     rm -rf /tmp/*
 COPY --from=bcrypt-builder /app/node_modules/bcrypt /app/node_modules/bcrypt
 COPY --from=backend-builder /app/src/backend ./src/backend
-RUN chown -R node:node /app
+RUN chown -R node:node /app && \
+    chmod -R 755 /app
 
-VOLUME ["/data/db"]
+VOLUME ["/data/db", "/var/log/mongodb"]
 EXPOSE 8080 8081 8082 27017
 
 COPY docker/entrypoint.sh /entrypoint.sh
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 245a054d..fb51a6e0 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -2,24 +2,32 @@
 set -e
 
 # Create required directories and set permissions
-mkdir -p /data/db /var/log/mongodb /var/run/mongodb
-chown -R mongodb:mongodb /data/db /var/log/mongodb /var/run/mongodb
-chmod 755 /data/db /var/log/mongodb /var/run/mongodb
+mkdir -p /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb
+chown -R mongodb:mongodb /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb
+chmod 755 /data/db /var/log/mongodb /var/run/mongodb /tmp/mongodb
 
-# Start MongoDB
+# Start MongoDB with proper permissions
 echo "Starting MongoDB..."
-gosu mongodb mongod --dbpath $MONGODB_DATA_DIR --logpath $MONGODB_LOG_DIR/mongodb.log --bind_ip 0.0.0.0 &
-MONGO_PID=$!
+gosu mongodb mongod --dbpath $MONGODB_DATA_DIR \
+    --logpath $MONGODB_LOG_DIR/mongodb.log \
+    --pidfilepath /tmp/mongodb/mongodb.pid \
+    --bind_ip_all \
+    --port 27017 \
+    --wiredTigerCacheSizeGB 1 &
 
 # Wait for MongoDB to be ready
 echo "Waiting for MongoDB to start..."
-until gosu mongodb mongo --eval "print(\"waited for connection\")" > /dev/null 2>&1; do
-    sleep 0.5
-    if ! kill -0 $MONGO_PID 2>/dev/null; then
+max_attempts=30
+attempt=0
+until gosu mongodb mongosh --eval "db.adminCommand('ping')" >/dev/null 2>&1; do
+    attempt=$((attempt + 1))
+    if [ $attempt -gt $max_attempts ]; then
         echo "MongoDB failed to start. Checking logs:"
         cat $MONGODB_LOG_DIR/mongodb.log
         exit 1
     fi
+    echo "Waiting for MongoDB... (attempt $attempt/$max_attempts)"
+    sleep 2
 done
 echo "MongoDB started successfully"
 
@@ -31,14 +39,35 @@ nginx
 echo "Starting backend services..."
 cd /app
 export NODE_ENV=production
+export MONGO_URL=mongodb://localhost:27017/termix
 
 # Start SSH service
-su -s /bin/bash node -c "node src/backend/ssh.cjs" &
+echo "Starting SSH service..."
+gosu node node src/backend/ssh.cjs &
+SSH_PID=$!
 
 # Start database service
-su -s /bin/bash node -c "node src/backend/database.cjs" &
+echo "Starting database service..."
+gosu node node src/backend/database.cjs &
+DB_PID=$!
 
-echo "All services started"
+# Wait a moment to ensure services are starting
+sleep 2
+
+# Check if services are running
+if ! kill -0 $SSH_PID 2>/dev/null; then
+    echo "SSH service failed to start. Checking logs..."
+    tail -n 50 /var/log/mongodb/mongodb.log
+    exit 1
+fi
+
+if ! kill -0 $DB_PID 2>/dev/null; then
+    echo "Database service failed to start. Checking logs..."
+    tail -n 50 /var/log/mongodb/mongodb.log
+    exit 1
+fi
+
+echo "All services started successfully"
 
 # Keep container running and show logs
-tail -f $MONGODB_LOG_DIR/mongodb.log
\ No newline at end of file
+exec tail -f $MONGODB_LOG_DIR/mongodb.log
\ No newline at end of file