diff --git a/.changeset/light-cats-agree.md b/.changeset/light-cats-agree.md
new file mode 100644
index 00000000..64123851
--- /dev/null
+++ b/.changeset/light-cats-agree.md
@@ -0,0 +1,7 @@
+---
+"@hyperdx/api": patch
+"@hyperdx/app": patch
+"@hyperdx/common-utils": patch
+---
+
+fix: map CLICKHOUSE_SERVER_ENDPOINT to otelcol ch exporter 'endpoint' field
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index 07a21657..96c9c349 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -5,7 +5,7 @@ services:
       context: ./docker/otel-collector
       target: dev
     environment:
-      CLICKHOUSE_SERVER_ENDPOINT: 'ch-server:9000'
+      CLICKHOUSE_ENDPOINT: 'tcp://ch-server:9000?dial_timeout=10s'
       HYPERDX_API_KEY: ${HYPERDX_API_KEY}
       HYPERDX_LOG_LEVEL: ${HYPERDX_LOG_LEVEL}
     volumes:
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 7dc8d8d0..5af5b6f0 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -22,7 +22,7 @@ services:
     image: otel/opentelemetry-collector-contrib:0.120.0
     environment:
       CLICKHOUSE_PROMETHEUS_METRICS_ENDPOINT: 'ch-server:9363'
-      CLICKHOUSE_SERVER_ENDPOINT: 'ch-server:9000'
+      CLICKHOUSE_ENDPOINT: 'tcp://ch-server:9000?dial_timeout=10s'
       HYPERDX_API_KEY: ${HYPERDX_API_KEY}
       HYPERDX_LOG_LEVEL: ${HYPERDX_LOG_LEVEL}
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index e7c97610..7c71d7c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,7 +51,7 @@ services:
   otel-collector:
     image: ${OTEL_COLLECTOR_IMAGE_NAME}:${IMAGE_VERSION}
     environment:
-      CLICKHOUSE_SERVER_ENDPOINT: 'ch-server:9000'
+      CLICKHOUSE_ENDPOINT: 'tcp://ch-server:9000?dial_timeout=10s'
       HYPERDX_LOG_LEVEL: ${HYPERDX_LOG_LEVEL}
     ports:
       - '13133:13133' # health_check extension
diff --git a/docker/hyperdx/entry.local.base.sh b/docker/hyperdx/entry.local.base.sh
index 1bd106ff..1f5cdb33 100644
--- a/docker/hyperdx/entry.local.base.sh
+++ b/docker/hyperdx/entry.local.base.sh
@@ -11,7 +11,7 @@ export SERVER_URL="http://127.0.0.1:${HYPERDX_API_PORT:-8000}"
 export FRONTEND_URL="${FRONTEND_URL:-${HYPERDX_APP_URL:-http://localhost}:${HYPERDX_APP_PORT:-8080}}"
 
 # Internal Services
-export CLICKHOUSE_SERVER_ENDPOINT="ch-server:9000"
+export CLICKHOUSE_ENDPOINT="tcp://ch-server:9000?dial_timeout=10s"
 export MONGO_URI="mongodb://db:27017/hyperdx"
 
 export EXPRESS_SESSION_SECRET="hyperdx is cool 👋"
diff --git a/docker/otel-collector/config.yaml b/docker/otel-collector/config.yaml
index cdcb2e97..7ff90bf4 100644
--- a/docker/otel-collector/config.yaml
+++ b/docker/otel-collector/config.yaml
@@ -96,7 +96,7 @@ exporters:
     sampling_initial: 5
     sampling_thereafter: 200
   clickhouse/rrweb:
-    endpoint: tcp://${env:CLICKHOUSE_SERVER_ENDPOINT}?dial_timeout=10s&compress=lz4
+    endpoint: ${env:CLICKHOUSE_ENDPOINT}
     database: default
     username: ${env:CLICKHOUSE_USER}
     password: ${env:CLICKHOUSE_PASSWORD}
@@ -109,7 +109,7 @@ exporters:
       max_interval: 30s
       max_elapsed_time: 300s
   clickhouse:
-    endpoint: tcp://${env:CLICKHOUSE_SERVER_ENDPOINT}?dial_timeout=10s&compress=lz4
+    endpoint: ${env:CLICKHOUSE_ENDPOINT}
     database: default
     username: ${env:CLICKHOUSE_USER}
     password: ${env:CLICKHOUSE_PASSWORD}
diff --git a/smoke-tests/otel-collector/docker-compose.yaml b/smoke-tests/otel-collector/docker-compose.yaml
index 491fb827..c2b2b590 100644
--- a/smoke-tests/otel-collector/docker-compose.yaml
+++ b/smoke-tests/otel-collector/docker-compose.yaml
@@ -21,7 +21,7 @@ services:
       file: ../../docker-compose.ci.yml
       service: otel-collector
     environment:
-      - CLICKHOUSE_SERVER_ENDPOINT=ch-server:9000
+      - CLICKHOUSE_ENDPOINT=tcp://ch-server:9000?dial_timeout=10s
       - CLICKHOUSE_PROMETHEUS_METRICS_ENDPOINT=ch-server:9363
       - HYPERDX_LOG_LEVEL=info
     ports: