diff --git a/docker/signoz/clickhouse/config.d/cluster.xml b/docker/signoz/clickhouse/config.d/cluster.xml
index c420538..7661647 100644
--- a/docker/signoz/clickhouse/config.d/cluster.xml
+++ b/docker/signoz/clickhouse/config.d/cluster.xml
@@ -2,7 +2,7 @@
 <clickhouse>
     <zookeeper>
         <node index="1">
-            <host>zookeeper</host>
+            <host>zookeeper-1</host>
             <port>2181</port>
         </node>
     </zookeeper>
diff --git a/docker/signoz/clickhouse/config.xml b/docker/signoz/clickhouse/config.xml
index ef79109..f1407e9 100644
--- a/docker/signoz/clickhouse/config.xml
+++ b/docker/signoz/clickhouse/config.xml
@@ -17,6 +17,7 @@
     <max_connections>4096</max_connections>
     <keep_alive_timeout>3</keep_alive_timeout>
     <max_concurrent_queries>100</max_concurrent_queries>
+    <allow_experimental_parameterized_queries>1</allow_experimental_parameterized_queries>
     <max_server_memory_usage>0</max_server_memory_usage>
     <max_thread_pool_size>10000</max_thread_pool_size>
     <max_server_memory_usage_to_ram_ratio>0.9</max_server_memory_usage_to_ram_ratio>
diff --git a/docker/signoz/compose.yaml b/docker/signoz/compose.yaml
index 05eca3d..1a71825 100644
--- a/docker/signoz/compose.yaml
+++ b/docker/signoz/compose.yaml
@@ -4,18 +4,27 @@ services:
     # ===========================================================================
     # ZooKeeper — required for ClickHouse coordination
     # ===========================================================================
-    zookeeper:
+    zookeeper-1:
         image: signoz/zookeeper:${ZOOKEEPER_VERSION:-3.7.1}
+        container_name: signoz-zookeeper-1
         restart: unless-stopped
         user: root
+        labels:
+            signoz.io/scrape: "true"
+            signoz.io/port: "9141"
+            signoz.io/path: "/metrics"
         environment:
-            ZOO_SERVER_ID: 1
+            ZOO_SERVER_ID: "1"
             ALLOW_ANONYMOUS_LOGIN: "yes"
-            ZOO_AUTOPURGE_INTERVAL: 1
+            ZOO_AUTOPURGE_INTERVAL: "1"
             ZOO_ENABLE_PROMETHEUS_METRICS: "yes"
-            ZOO_PROMETHEUS_METRICS_PORT_NUMBER: 9141
+            ZOO_PROMETHEUS_METRICS_PORT_NUMBER: "9141"
         volumes:
             - ./zookeeper-data:/bitnami/zookeeper
+        logging:
+            options:
+                max-size: 50m
+                max-file: "3"
         healthcheck:
             test:
                 - CMD-SHELL
@@ -31,6 +40,7 @@ services:
     # ===========================================================================
     init-clickhouse:
         image: clickhouse/clickhouse-server:${CLICKHOUSE_VERSION:-25.5}
+        container_name: signoz-init-clickhouse
         restart: on-failure
         command:
             - bash
@@ -48,6 +58,10 @@ services:
                 echo "Done (non-critical if download failed — migrator will handle it)."
         volumes:
             - ./clickhouse/user_scripts:/var/lib/clickhouse/user_scripts
+        logging:
+            options:
+                max-size: 50m
+                max-file: "3"
         networks:
             - signoz
 
@@ -56,12 +70,17 @@ services:
     # ===========================================================================
     clickhouse:
         image: clickhouse/clickhouse-server:${CLICKHOUSE_VERSION:-25.5}
+        container_name: signoz-clickhouse
         restart: unless-stopped
         tty: true
+        labels:
+            signoz.io/scrape: "true"
+            signoz.io/port: "9363"
+            signoz.io/path: "/metrics"
         depends_on:
             init-clickhouse:
                 condition: service_completed_successfully
-            zookeeper:
+            zookeeper-1:
                 condition: service_healthy
         environment:
             CLICKHOUSE_SKIP_USER_SETUP: "1"
@@ -72,6 +91,10 @@ services:
             - ./clickhouse/user_scripts:/var/lib/clickhouse/user_scripts:ro
             - ./clickhouse/config.d/cluster.xml:/etc/clickhouse-server/config.d/cluster.xml:ro
             - ./clickhouse-data:/var/lib/clickhouse
+        logging:
+            options:
+                max-size: 50m
+                max-file: "3"
         healthcheck:
             test:
                 - CMD
@@ -95,6 +118,7 @@ services:
     # ===========================================================================
     signoz:
         image: signoz/signoz:${SIGNOZ_VERSION:-v0.128.0}
+        container_name: signoz
         restart: unless-stopped
         depends_on:
             clickhouse:
@@ -109,6 +133,10 @@ services:
             - ${EXPOSE_SIGNOZ_UI_PORT:-8080}:8080
         volumes:
             - ./signoz-data:/var/lib/signoz
+        logging:
+            options:
+                max-size: 50m
+                max-file: "3"
         healthcheck:
             test:
                 - CMD
@@ -136,6 +164,7 @@ services:
     # ===========================================================================
     otel-collector:
         image: signoz/signoz-otel-collector:${OTELCOL_VERSION:-v0.144.5}
+        container_name: signoz-otel-collector
         restart: unless-stopped
         depends_on:
             clickhouse:
@@ -162,6 +191,10 @@ services:
             - ${EXPOSE_OTLP_GRPC_PORT:-4317}:4317
             # OTLP HTTP receiver
             - ${EXPOSE_OTLP_HTTP_PORT:-4318}:4318
+        logging:
+            options:
+                max-size: 50m
+                max-file: "3"
         networks:
             - signoz
             - pipeline
@@ -169,8 +202,9 @@ services:
     # ===========================================================================
     # Telemetry Store Migrator — runs ClickHouse migrations
     # ===========================================================================
-    migrator:
+    signoz-telemetrystore-migrator:
         image: signoz/signoz-otel-collector:${OTELCOL_VERSION:-v0.144.5}
+        container_name: signoz-telemetrystore-migrator
         restart: on-failure
         depends_on:
             clickhouse:
@@ -189,6 +223,10 @@ services:
                 /signoz-otel-collector migrate bootstrap &&
                 /signoz-otel-collector migrate sync up &&
                 /signoz-otel-collector migrate async up
+        logging:
+            options:
+                max-size: 50m
+                max-file: "3"
         networks:
             - signoz