diff --git a/clickhouse/clickhouse-config.xml b/clickhouse/clickhouse-config.xml
index 0dfaa70..4e88592 100644
--- a/clickhouse/clickhouse-config.xml
+++ b/clickhouse/clickhouse-config.xml
@@ -1,9 +1,8 @@
 <clickhouse>
     <logger>
         <level>warning</level>
-        <console>true</console>
     </logger>
-    
+
     <!-- 
     Avoid the warning: "Listen [::]:9009 failed: Address family for hostname not supported". 
     If Docker has IPv6 disabled, bind ClickHouse to IPv4 to prevent this issue. 
@@ -11,13 +10,31 @@
     <listen_host>0.0.0.0</listen_host>
     -->
 
-    <!-- Stop all the unnecessary logging -->
+    <query_log replace="1">
+        <database>system</database>
+        <table>query_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <engine>
+ENGINE = MergeTree
+PARTITION BY event_date
+ORDER BY (event_time)
+TTL event_date + interval 90 day
+SETTINGS ttl_only_drop_parts=1
+        </engine>
+    </query_log>
+
+    <metric_log>
+        <partition_by>event_date</partition_by>
+        <ttl>event_date + INTERVAL 30 DAY DELETE</ttl>
+    </metric_log>
+
+    <asynchronous_metric_log>
+        <partition_by>event_date</partition_by>
+        <ttl>event_date + INTERVAL 30 DAY DELETE</ttl>
+    </asynchronous_metric_log>
+
+    <!-- Stop 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"/>
 </clickhouse>