diff --git a/docker-compose.yml b/docker-compose.yml
index e06e49f..4337a0d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,9 @@ services:
       - "8080:8080"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - upaas-data:/var/lib/upaas
-    # environment:
+      - ${HOST_DATA_DIR:-./data}:/var/lib/upaas
+    environment:
+      - UPAAS_HOST_DATA_DIR=${HOST_DATA_DIR:-./data}
       # Optional: uncomment to enable debug logging
       # - DEBUG=true
       # Optional: Sentry error reporting
@@ -15,6 +16,3 @@ services:
       # Optional: Prometheus metrics auth
       # - METRICS_USERNAME=prometheus
       # - METRICS_PASSWORD=secret
-
-volumes:
-  upaas-data: