diff --git a/docker/signoz/clickhouse/config.d/cluster.xml b/docker/signoz/clickhouse/config.d/cluster.xml
index 5d785ac..c420538 100644
--- a/docker/signoz/clickhouse/config.d/cluster.xml
+++ b/docker/signoz/clickhouse/config.d/cluster.xml
@@ -9,6 +9,7 @@
     <remote_servers>
         <cluster>
             <shard>
+                <internal_replication>true</internal_replication>
                 <replica>
                     <host>clickhouse</host>
                     <port>9000</port>
diff --git a/docker/signoz/clickhouse/config.xml b/docker/signoz/clickhouse/config.xml
index 5740efe..ef79109 100644
--- a/docker/signoz/clickhouse/config.xml
+++ b/docker/signoz/clickhouse/config.xml
@@ -13,6 +13,7 @@
     <mysql_port>9004</mysql_port>
     <postgresql_port>9005</postgresql_port>
     <interserver_http_port>9009</interserver_http_port>
+    <listen_host>0.0.0.0</listen_host>
     <max_connections>4096</max_connections>
     <keep_alive_timeout>3</keep_alive_timeout>
     <max_concurrent_queries>100</max_concurrent_queries>
@@ -35,6 +36,10 @@
     <default_profile>default</default_profile>
     <default_database>default</default_database>
     <custom_settings_prefixes></custom_settings_prefixes>
+    <macros>
+        <shard>01</shard>
+        <replica>signoz01-01-1</replica>
+    </macros>
     <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
     <max_session_timeout>3600</max_session_timeout>
     <default_session_timeout>60</default_session_timeout>
diff --git a/docker/signoz/compose.yaml b/docker/signoz/compose.yaml
index a675ba3..05eca3d 100644
--- a/docker/signoz/compose.yaml
+++ b/docker/signoz/compose.yaml
@@ -37,14 +37,15 @@ services:
             - -c
             - |
                 version="v0.0.1"
-                node_os=$(uname -s | tr '[:upper:]' '[:lower:]')
-                node_arch=$(uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/)
+                # Hardcode linux/amd64 for Unraid x86_64 (uname may be unavailable in slim image)
+                node_os="linux"
+                node_arch="amd64"
                 echo "Fetching histogram-binary for ${node_os}/${node_arch}"
                 cd /tmp
-                wget -O histogram-quantile.tar.gz "https://github.com/SigNoz/signoz/releases/download/histogram-quantile%2F${version}/histogram-quantile_${node_os}_${node_arch}.tar.gz"
-                tar -xvzf histogram-quantile.tar.gz
-                mv histogram-quantile /var/lib/clickhouse/user_scripts/histogramQuantile
-                echo "Done."
+                wget -O histogram-quantile.tar.gz "https://github.com/SigNoz/signoz/releases/download/histogram-quantile%2F${version}/histogram-quantile_${node_os}_${node_arch}.tar.gz" || true
+                tar -xvzf histogram-quantile.tar.gz 2>/dev/null || true
+                mv histogram-quantile /var/lib/clickhouse/user_scripts/histogramQuantile 2>/dev/null || true
+                echo "Done (non-critical if download failed — migrator will handle it)."
         volumes:
             - ./clickhouse/user_scripts:/var/lib/clickhouse/user_scripts
         networks:
@@ -184,6 +185,7 @@ services:
         command:
             - -c
             - |
+                echo "Waiting 30s for ClickHouse cluster to stabilize..." && sleep 30 &&
                 /signoz-otel-collector migrate bootstrap &&
                 /signoz-otel-collector migrate sync up &&
                 /signoz-otel-collector migrate async up