diff --git a/.server-changes/hosting-clickhouse-system-logs.md b/.server-changes/hosting-clickhouse-system-logs.md
new file mode 100644
index 0000000000..dc6724232f
--- /dev/null
+++ b/.server-changes/hosting-clickhouse-system-logs.md
@@ -0,0 +1,6 @@
+---
+area: hosting
+type: fix
+---
+
+Self-hosted ClickHouse now disables its unbounded internal telemetry tables and keeps query/error logs on a bounded retention, fixing runaway CPU and memory usage on the recommended machine size. Existing self-hosted deployments must drop the previously written disabled log tables separately to reclaim disk.
diff --git a/hosting/docker/clickhouse/override.xml b/hosting/docker/clickhouse/override.xml
index 41897c2984..f9088054a7 100644
--- a/hosting/docker/clickhouse/override.xml
+++ b/hosting/docker/clickhouse/override.xml
@@ -9,12 +9,42 @@
524288000
1
-
-
- 8192
- 1
- 0
- 0
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ event_date + INTERVAL 7 DAY DELETE
+
+
+ event_date + INTERVAL 30 DAY DELETE
+
+
+
+
diff --git a/hosting/docker/clickhouse/users-override.xml b/hosting/docker/clickhouse/users-override.xml
new file mode 100644
index 0000000000..a3964125b8
--- /dev/null
+++ b/hosting/docker/clickhouse/users-override.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ 8192
+ 1
+ 0
+ 0
+
+ 0
+ 0
+ 0
+ 0
+
+
+
diff --git a/hosting/docker/webapp/docker-compose.yml b/hosting/docker/webapp/docker-compose.yml
index a8bc1167b7..b893c17eca 100644
--- a/hosting/docker/webapp/docker-compose.yml
+++ b/hosting/docker/webapp/docker-compose.yml
@@ -177,6 +177,7 @@ services:
- clickhouse:/var/lib/clickhouse
- ../clickhouse/data-paths.xml:/etc/clickhouse-server/config.d/data-paths.xml:ro
- ../clickhouse/override.xml:/etc/clickhouse-server/config.d/override.xml:ro
+ - ../clickhouse/users-override.xml:/etc/clickhouse-server/users.d/override.xml:ro
networks:
- webapp
healthcheck: