diff --git a/Dockerfile b/Dockerfile
index 5692261..fd64a21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -60,15 +60,22 @@ WORKDIR /app
 
 # Copy the Rust backend binary
 COPY --from=backend-builder /app/target/release/Calendar-Curator /app/calendar-curator
+RUN chgrp 0 /app/calendar-curator && chmod g+rx /app/calendar-curator
 
 # Copy the built frontend
 COPY --from=frontend-builder /app/frontend/.next/standalone ./frontend/
 COPY --from=frontend-builder /app/frontend/.next/static ./frontend/.next/static
 COPY --from=frontend-builder /app/frontend/public ./frontend/public
+RUN chgrp -R 0 ./frontend && chmod -R g+rwX ./frontend
+
 COPY ./start.sh /app/start.sh
+RUN chgrp 0 /app/start.sh && chmod g+rx /app/start.sh
 
 # Create data directory for persistent storage
-RUN mkdir -p /app/data
+RUN mkdir -p /app/data && chgrp 0 /app/data && chmod g+rwX /app/data
+
+RUN chgrp -R 0 /app \
+    && chmod -R g+rwX /app
 
 # Set environment variables
 ENV DATABASE_PATH=/app/data/calendars.json
diff --git a/start.sh b/start.sh
index 6d59721..8c63c48 100755
--- a/start.sh
+++ b/start.sh
@@ -11,8 +11,8 @@ cd frontend
 export NODE_ENV=production
 export PORT=3000
 export HOSTNAME="0.0.0.0"
-node server.js &
+node server.js --hostname $HOSTNAME &
 FRONTEND_PID=$!
 
 # Wait for both processes
-wait $BACKEND_PID $FRONTEND_PID
\ No newline at end of file
+wait $BACKEND_PID $FRONTEND_PID