diff --git a/charts/operator-wandb/charts/clickhouse/templates/_helpers.tpl b/charts/operator-wandb/charts/clickhouse/templates/_helpers.tpl
index 6ad74ecc..b2d4c781 100644
--- a/charts/operator-wandb/charts/clickhouse/templates/_helpers.tpl
+++ b/charts/operator-wandb/charts/clickhouse/templates/_helpers.tpl
@@ -161,7 +161,7 @@ ClickHouse Server Configuration
             <default>
                 <password>{{ include "wandb.clickhouse.password" $ }}</password>
                 <access_management>1</access_management>
-                <profile>default</profile>
+                <profile>{{ include "wandb.clickhouse.user" $ }}</profile>
             </default>
         </users>
         <path>/var/lib/clickhouse/</path>
diff --git a/charts/operator-wandb/templates/_clickhouse.tpl b/charts/operator-wandb/templates/_clickhouse.tpl
index b5bd64de..24ca07cd 100644
--- a/charts/operator-wandb/templates/_clickhouse.tpl
+++ b/charts/operator-wandb/templates/_clickhouse.tpl
@@ -15,7 +15,7 @@
 {{- if .Values.global.clickhouse.external -}}
   {{- .Values.global.clickhouse.host | default "default-host" -}}
 {{- else -}}
-  {{- include "wandb.clickhouse.fullname" . }}-ch-headless
+  {{- include "wandb.clickhouse.fullname" . }}-ch-server-headless.{{ .Release.Name }}.svc.cluster.local
 {{- end }}
 {{- end }}
 
@@ -26,19 +26,10 @@ Return name of secret where ClickHouse information is stored
 {{- if .Values.global.clickhouse.passwordSecret.name -}}
   {{- .Values.global.clickhouse.passwordSecret.name -}}
 {{- else -}}
-  default
+  {{- printf "%s-clickhouse-secret" .Release.Name -}}
 {{- end -}}
 {{- end -}}
 
-{{- define "wandb.clickhouse.imagePullSecrets" -}}
-{{- if .Values.global.clickhouse.imagePullSecrets.name -}}
-  {{- .Values.global.clickhouse.imagePullSecrets.name -}}
-{{- else -}}
-  {{- printf "%s-clickhouse" .Release.Name -}}
-{{- end -}}
-{{- end -}}
-
-
 {{/*
 Return name of secret where ClickHouse information is stored
 */}}
@@ -46,7 +37,7 @@ Return name of secret where ClickHouse information is stored
 {{- if .Values.global.clickhouse.passwordSecret.name }}
   {{- .Values.global.clickhouse.passwordSecret.passwordKey | default "default" -}}
 {{- else -}}
-  default
+  CLICKHOUSE_PASSWORD
 {{- end -}}
 {{- end }}
 
diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
index f627e05c..53e22843 100644
--- a/charts/operator-wandb/values.yaml
+++ b/charts/operator-wandb/values.yaml
@@ -268,14 +268,10 @@ clickhouse:
   server_image:
     repository: "clickhouse/clickhouse-server"
     tag: "latest"
-  server:
-    httpPort: 8123
   keeper_image:
     repository: "clickhouse/clickhouse-keeper"
     tag: "latest"
   local_storage: "100Gi"
-  database: "weave_trace_db"
-  password: "default"
   buckets:
     access_key_id: ""
     secret_access_key: ""