diff --git a/Dockerfile b/Dockerfile
index e0fb6af..2c7b954 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,19 +4,25 @@ LABEL org.opencontainers.image.source=https://github.com/BlessedRebuS/Krawl
 
 WORKDIR /app
 
+# Install gosu for dropping privileges
+RUN apt-get update && apt-get install -y --no-install-recommends gosu && \
+    rm -rf /var/lib/apt/lists/*
+
 COPY requirements.txt /app/
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY src/ /app/src/
 COPY wordlists.json /app/
+COPY entrypoint.sh /app/
 
 RUN useradd -m -u 1000 krawl && \
-    chown -R krawl:krawl /app
-
-USER krawl
+    mkdir -p /app/logs /app/data && \
+    chown -R krawl:krawl /app && \
+    chmod +x /app/entrypoint.sh
 
 EXPOSE 5000
 
 ENV PYTHONUNBUFFERED=1
 
+ENTRYPOINT ["/app/entrypoint.sh"]
 CMD ["python3", "src/server.py"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 776e919..02b6ae7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -11,6 +11,7 @@ services:
     volumes:
       - ./wordlists.json:/app/wordlists.json:ro
       - ./config.yaml:/app/config.yaml:ro
+      - ./logs:/app/logs
     environment:
       - CONFIG_LOCATION=config.yaml
     restart: unless-stopped
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100644
index 0000000..28b5fc0
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+# Fix ownership of mounted directories
+chown -R krawl:krawl /app/logs /app/data 2>/dev/null || true
+
+# Drop to krawl user and run the application
+exec gosu krawl "$@"