diff --git a/compose.infra.yaml b/compose.infra.yaml
index fbc048e0..07622aae 100644
--- a/compose.infra.yaml
+++ b/compose.infra.yaml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 services:
   postgres:
@@ -19,6 +19,9 @@ services:
   clickhouse:
     image: clickhouse/clickhouse-server:latest
     container_name: baron_clickhouse
+    environment:
+      CLICKHOUSE_USER: ${CLICKHOUSE_USER:-baron}
+      CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-password}
     ports:
       - "${CLICKHOUSE_PORT_HTTP:-8123}:8123"
       - "${CLICKHOUSE_PORT_NATIVE:-9000}:9000"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 172a45cd..c086d936 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 
 services:
   backend:
@@ -12,6 +12,8 @@ services:
       - DB_HOST=postgres
       - CLICKHOUSE_HOST=clickhouse
       - CLICKHOUSE_PORT=${CLICKHOUSE_PORT_NATIVE:-9000}
+      - CLICKHOUSE_USER=${CLICKHOUSE_USER:-baron}
+      - CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD:-password}
     ports:
       - "${BACKEND_PORT:-3000}:3000"
     depends_on:
@@ -32,12 +34,22 @@ services:
       - "${FRONTEND_PORT:-5000}:5000"
     volumes:
       - ./frontend:/app
-    command: ["flutter", "run", "-d", "web-server", "--web-port", "5000", "--web-hostname", "0.0.0.0"]
+    command:
+      [
+        "flutter",
+        "run",
+        "-d",
+        "web-server",
+        "--web-port",
+        "5000",
+        "--web-hostname",
+        "0.0.0.0",
+      ]
     networks:
       - baron_net
 
-  # Dummy service to wait for infra network if needed, 
-  # but essentially we assume infra is running. 
+  # Dummy service to wait for infra network if needed,
+  # but essentially we assume infra is running.
   # In a real unified stack, we might include infra here or use external links.
   # Here we attach to the same network.
   infra_check: