diff --git a/Dockerfile b/Dockerfile
index 608d5b6..8be5184 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,8 +27,11 @@ RUN pip install --no-cache-dir --upgrade pip && \
 # Copy application code
 COPY ./app /usr/src/app/app
 
-# Create directories for volumes
-RUN mkdir -p /usr/src/app/storage
+# Create non-root user and set up directories for volumes
+RUN addgroup --system appuser && adduser --system --ingroup appuser appuser
+RUN mkdir -p /usr/src/app/storage /usr/src/app/logs && \
+    chown -R appuser:appuser /usr/src/app
+USER appuser
 
 # Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=3 \