diff --git a/charts/databend-query/templates/configmap.yaml b/charts/databend-query/templates/configmap.yaml
index 60b4913..e8dcde3 100644
--- a/charts/databend-query/templates/configmap.yaml
+++ b/charts/databend-query/templates/configmap.yaml
@@ -57,13 +57,10 @@ data:
         on = {{ .Values.config.log.query.enabled }}
         otlp_endpoint = {{ .Values.config.log.query.otlp_endpoint | quote }}
         otlp_protocol = {{ .Values.config.log.query.otlp_protocol | default "http" | quote }}
-      {{- with .Values.config.log.query.otlp_labels }}
-      [log.query.otlp_labels]
-        {{- if .tenant }}
-        tenant = {{ .tenant | quote }}
-        {{- end }}
-        {{- if .warehouse }}
-        warehouse = {{ .warehouse | quote }}
+      {{- with .Values.config.log.profile.otlp_labels }}
+      [log.profile.otlp_labels]
+        {{- range $key, $value := . }}
+        {{ $key }} = {{ $value | quote }}
         {{- end }}
       {{- end }}
       [log.profile]
@@ -72,11 +69,8 @@ data:
         otlp_protocol = {{ .Values.config.log.profile.otlp_protocol | default "http" | quote }}
       {{- with .Values.config.log.profile.otlp_labels }}
       [log.profile.otlp_labels]
-        {{- if .tenant }}
-        tenant = {{ .tenant | quote }}
-        {{- end }}
-        {{- if .warehouse }}
-        warehouse = {{ .warehouse | quote }}
+        {{- range $key, $value := . }}
+        {{ $key }} = {{ $value | quote }}
         {{- end }}
       {{- end }}