diff --git a/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml b/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml
index 9a8c8b6..d4f318c 100644
--- a/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml
+++ b/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml
@@ -41,7 +41,7 @@ spec:
             - name: HYPERDX_LOG_LEVEL
               value: {{ .Values.hyperdx.logLevel }}
             - name: HYPERDX_OTEL_EXPORTER_CLICKHOUSE_DATABASE
-              value: {{ .Values.hyperdx.clickhouseDatabase | default "default" }}
+              value: {{ .Values.otel.clickhouseDatabase | default "default" }}
             - name: HYPERDX_API_KEY
               valueFrom:
                 secretKeyRef:
diff --git a/charts/hdx-oss-v2/tests/otel-collector_test.yaml b/charts/hdx-oss-v2/tests/otel-collector_test.yaml
index c1fbc83..0ed90fa 100644
--- a/charts/hdx-oss-v2/tests/otel-collector_test.yaml
+++ b/charts/hdx-oss-v2/tests/otel-collector_test.yaml
@@ -338,9 +338,9 @@ tests:
       otel:
         enabled: true
         image: hyperdx/hyperdx-otel-collector:2-beta
+        clickhouseDatabase: "custom_db"
       hyperdx:
         logLevel: info
-        clickhouseDatabase: "custom_db"
       clickhouse:
         config:
           users:
diff --git a/charts/hdx-oss-v2/values.yaml b/charts/hdx-oss-v2/values.yaml
index 3f572bd..92603f7 100644
--- a/charts/hdx-oss-v2/values.yaml
+++ b/charts/hdx-oss-v2/values.yaml
@@ -14,8 +14,6 @@ hyperdx:
   usageStatsEnabled: true
   # Endpoint to send hyperdx logs/traces/metrics to.Defaults to the chart's otel collector endpoint.
   otelExporterEndpoint: http://{{ include "hdx-oss.fullname" . }}-otel-collector:{{ .Values.otel.httpPort }}
-  # Clickhouse database to send logs/traces/metrics to. Defaults to "default"
-  clickhouseDatabase: "default"
   annotations: {}
     # myAnnotation: "myValue"
   labels: {}
@@ -204,6 +202,8 @@ otel:
   # Leave empty if prometheus is disabled.
   # Example: clickhousePrometheusEndpoint: "http://custom-clickhouse-service:9363"
   clickhousePrometheusEndpoint:
+  # Clickhouse database to send logs/traces/metrics to. Defaults to "default"
+  clickhouseDatabase: "default"
 
 persistence:
   mongodb: