diff --git a/scripts/docker-compose/docker-compose.yaml b/scripts/docker-compose/docker-compose.yaml
index 164548436..3af89c80f 100644
--- a/scripts/docker-compose/docker-compose.yaml
+++ b/scripts/docker-compose/docker-compose.yaml
@@ -161,7 +161,7 @@ services:
           done
 
           echo "clickhouse is up - executing command"
-          clickhouse-client -h ${CH_HOST} --user ${CH_USERNAME} ${CH_PASSWORD} --port ${CH_PORT} --multiquery < /tmp/init_schema.sql || true
+          clickhouse-client -h clickhouse-openreplay-clickhouse.db.svc.cluster.local --user default --port 8123 --multiquery < /tmp/init_schema.sql || true
   
   alerts-openreplay:
     image: public.ecr.aws/p1t3u8a3/alerts:${COMMON_VERSION}
diff --git a/scripts/docker-compose/hacks/tpls/docker-compose.tpl b/scripts/docker-compose/hacks/tpls/docker-compose.tpl
index be889d659..5470b191b 100644
--- a/scripts/docker-compose/hacks/tpls/docker-compose.tpl
+++ b/scripts/docker-compose/hacks/tpls/docker-compose.tpl
@@ -161,7 +161,7 @@ services:
           done
 
           echo "clickhouse is up - executing command"
-          clickhouse-client -h ${CH_HOST} --user ${CH_USERNAME} ${CH_PASSWORD} --port ${CH_PORT} --multiquery < /tmp/init_schema.sql || true
+          clickhouse-client -h {{.Values.global.clickhouse.chHost}} --user {{.Values.global.clickhouse.username}} --port {{.Values.global.clickhouse.service.dataPort}} --multiquery < /tmp/init_schema.sql || true
 
   {{- define "service" -}}
   {{- $service_name := . }}
diff --git a/scripts/docker-compose/hacks/tpls/env.tpl b/scripts/docker-compose/hacks/tpls/env.tpl
index ec84a7935..60b9c7e48 100644
--- a/scripts/docker-compose/hacks/tpls/env.tpl
+++ b/scripts/docker-compose/hacks/tpls/env.tpl
@@ -1,6 +1,6 @@
 {{- $excludedKeys := list "POD_NAMESPACE" -}}
 {{ range (index .Values.spec.template.spec.containers 0).env -}}
 {{- if not (has .name $excludedKeys) -}}
-{{ .name }}="{{ .value }}"
+{{ .name }}="{{ if eq .value "<no value>" }}{{ else }}{{ .value }}{{ end }}"
 {{ end -}}
 {{ end -}}