diff --git a/docker-compose.yml b/docker-compose.yml
index 00211d05..fa22be05 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,14 +35,14 @@ services:
       - 6379:6379
 
   op-ch:
-    image: clickhouse/clickhouse-server:24.12.2.29-alpine
+    image: clickhouse/clickhouse-server:25.10.2.65
     restart: always
     volumes:
       - ./docker/data/op-ch-data:/var/lib/clickhouse
       - ./docker/data/op-ch-logs:/var/log/clickhouse-server
-      - ./self-hosting/clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/op-config.xml
-      - ./self-hosting/clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/op-user-config.xml
-      - ./self-hosting/clickhouse/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh:ro
+      - ./docker/clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/op-config.xml
+      - ./docker/clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/op-user-config.xml
+      - ./docker/clickhouse/init-db.sh:/docker-entrypoint-initdb.d/init-db.sh:ro
     ulimits:
       nofile:
         soft: 262144
diff --git a/docker/clickhouse/clickhouse-config.xml b/docker/clickhouse/clickhouse-config.xml
new file mode 100644
index 00000000..1277b825
--- /dev/null
+++ b/docker/clickhouse/clickhouse-config.xml
@@ -0,0 +1,29 @@
+<clickhouse>
+    <logger>
+        <level>warning</level>
+        <console>true</console>
+    </logger>
+    
+    <keep_alive_timeout>10</keep_alive_timeout>
+    
+    <!-- Stop all the unnecessary logging -->
+    <query_thread_log remove="remove"/>
+    <query_log remove="remove"/>
+    <text_log remove="remove"/>
+    <trace_log remove="remove"/>
+    <metric_log remove="remove"/>
+    <asynchronous_metric_log remove="remove"/>
+    <session_log remove="remove"/>
+    <part_log remove="remove"/>
+
+    <listen_host>0.0.0.0</listen_host>
+    <interserver_listen_host>0.0.0.0</interserver_listen_host>
+    <interserver_http_host>op-ch</interserver_http_host>
+
+    <!-- Not used anymore, but kept for backwards compatibility -->
+    <macros>
+        <shard>1</shard>
+        <replica>replica1</replica>
+        <cluster>openpanel_cluster</cluster>
+    </macros>
+</clickhouse>
\ No newline at end of file
diff --git a/docker/clickhouse/clickhouse-user-config.xml b/docker/clickhouse/clickhouse-user-config.xml
new file mode 100644
index 00000000..c8fdca29
--- /dev/null
+++ b/docker/clickhouse/clickhouse-user-config.xml
@@ -0,0 +1,19 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <log_queries>0</log_queries>
+            <log_query_threads>0</log_query_threads>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password>default</password>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </default>
+    </users>
+</clickhouse>
\ No newline at end of file
diff --git a/docker/clickhouse/init-db.sh b/docker/clickhouse/init-db.sh
new file mode 100755
index 00000000..e86d8af3
--- /dev/null
+++ b/docker/clickhouse/init-db.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+clickhouse client -n <<-EOSQL
+    CREATE DATABASE IF NOT EXISTS openpanel;
+EOSQL
\ No newline at end of file