diff --git a/Dockerfile b/Dockerfile
index 0718b3fc1..58f0fbbb7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,8 @@ COPY backend/ ./backend/
 COPY --from=frontend-builder /app/static ./static
 
 # Create data directory for persistent storage
-RUN mkdir -p /app/data /app/logs
+# chmod 777 allows running as non-root user (e.g., with docker compose user: directive)
+RUN mkdir -p /app/data /app/logs && chmod 777 /app/data /app/logs
 
 # Environment variables
 ENV PYTHONUNBUFFERED=1
diff --git a/docker-compose.yml b/docker-compose.yml
index b82c50d5b..2bf08d112 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,9 @@ services:
     #   docker compose up -d          → pulls pre-built image from ghcr.io
     #   docker compose up -d --build  → builds locally from source
     container_name: bambuddy
+    # Run as current user to avoid permission issues with mounted volumes
+    # Override with: PUID=$(id -u) PGID=$(id -g) docker compose up -d
+    user: "${PUID:-1000}:${PGID:-1000}"
     #
     # LINUX: Use host mode for printer discovery and camera streaming
     network_mode: host