diff --git a/docker/docker-compose.kafka.yml b/docker/docker-compose.kafka.yml
index 02e4412..8ec9c8a 100644
--- a/docker/docker-compose.kafka.yml
+++ b/docker/docker-compose.kafka.yml
@@ -6,7 +6,6 @@ services:
     networks:
       heidgaf:
         ipv4_address: 172.27.0.2
-    restart: "unless-stopped"
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_SERVER_ID: 1
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1ddd730..82993c7 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,7 +2,6 @@ include:
   - "docker-compose.kafka.yml"
 
 services:
-
   logcollector:
     build:
       context: ..
@@ -18,6 +17,8 @@ services:
         condition: service_healthy
       logserver:
         condition: service_started
+      clickhouse-server:
+        condition: service_healthy
     networks:
       heidgaf:
         ipv4_address: 172.27.0.7
@@ -44,6 +45,8 @@ services:
         condition: service_healthy
       kafka3:
         condition: service_healthy
+      clickhouse-server:
+        condition: service_healthy
     ports:
       - 9998:9998
     networks:
@@ -81,6 +84,8 @@ services:
         condition: service_started
       logcollector:
         condition: service_started
+      clickhouse-server:
+        condition: service_healthy
     networks:
       heidgaf:
         ipv4_address: 172.27.0.6
@@ -112,6 +117,8 @@ services:
         condition: service_started
       logserver:
         condition: service_started
+      clickhouse-server:
+        condition: service_healthy
     networks:
       heidgaf:
         ipv4_address: 172.27.0.9
@@ -143,6 +150,8 @@ services:
         condition: service_started
       logserver:
         condition: service_started
+      clickhouse-server:
+        condition: service_healthy
     networks:
       heidgaf:
         ipv4_address: 172.27.0.10
@@ -161,6 +170,22 @@ services:
               count: 1 # alternatively, use `count: all` for all GPUs
               capabilities: [gpu]
 
+  clickhouse-server:
+    image: clickhouse/clickhouse-server:24.3.12.75-alpine
+    container_name: clickhouse-server
+    networks:
+      heidgaf:
+        ipv4_address: 172.27.0.11
+    restart: "unless-stopped"
+    ports:
+      - "8123:8123"
+      - "9000:9000"
+    healthcheck:
+      test: [ "CMD-SHELL", "nc -z 127.0.0.1 8123" ]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+
 networks:
   heidgaf:
     driver: bridge