diff --git a/Dockerfile b/Dockerfile
index ce2f08e..1b6a746 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,9 +35,13 @@ RUN apk add --no-cache \
 # Copy binary from builder
 COPY --from=builder /pixad /usr/local/bin/pixad
 
-# Create non-root user
-RUN adduser -D -H -s /sbin/nologin pixad
+# Create non-root user and data directory
+RUN adduser -D -H -s /sbin/nologin pixad && \
+    mkdir -p /var/lib/pixa && \
+    chown pixad:pixad /var/lib/pixa
+
 USER pixad
+WORKDIR /var/lib/pixa
 
 EXPOSE 8080
 
diff --git a/internal/config/config.go b/internal/config/config.go
index 8230d5a..bd8ff4d 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -17,7 +17,7 @@ import (
 // Default configuration values.
 const (
 	DefaultPort                       = 8080
-	DefaultStateDir                   = "./data"
+	DefaultStateDir                   = "/var/lib/pixa"
 	DefaultUpstreamConnectionsPerHost = 20
 )