diff --git a/charts/ska-tango-base/templates/databaseds.yaml b/charts/ska-tango-base/templates/databaseds.yaml
index 54f6e0b6cb1535c73d72f1bdf5eec25356993167..43254d5eefaef5008048ad2532b702ae8fc497ee 100644
--- a/charts/ska-tango-base/templates/databaseds.yaml
+++ b/charts/ska-tango-base/templates/databaseds.yaml
@@ -35,6 +35,7 @@ metadata:
 {{- end }}
 {{- end }}
 spec:
+  clusterDomain: {{ $cluster_domain }}
   usePV: {{ .Values.tangodb.use_pv }}
 {{- if or (.Values.global.minikube) (.Values.global.exposeAllDS) }}
   enableLoadBalancer: true
diff --git a/charts/ska-tango-util/templates/_operator-ds.yaml b/charts/ska-tango-util/templates/_operator-ds.yaml
index ede639902a49643cf8188a50fef8ccbc1f007443..1995ebbf20db2460445316b17885f2511300b77d 100644
--- a/charts/ska-tango-util/templates/_operator-ds.yaml
+++ b/charts/ska-tango-util/templates/_operator-ds.yaml
@@ -12,6 +12,7 @@ Parameters:
 {{- $default_tango_host := printf "%s-%s:10000" "databaseds-tango-base-" .local.Release.Name }}
 {{- $tango_host := tpl (coalesce .local.Values.global.tango_host .local.Values.tango_host $default_tango_host | toString) .local }}
 {{- $databaseds_name := (split ":" $tango_host)._0 }} 
+{{- $cluster_domain := coalesce .local.Values.global.cluster_domain "cluster.local" }}
 {{- $chart := .local }}
 {{- $deviceserver := .deviceserver }}
 {{- $deviceserver_name := tpl (coalesce .name .deviceserver.name | toString) .local }}
@@ -35,6 +36,7 @@ metadata:
 {{ toYaml $annotations | indent 4 }}
 {{- end }}
 spec:
+  clusterDomain: {{ $cluster_domain }}
 {{- if or ($chart.Values.global.minikube) ($chart.Values.global.exposeAllDS) ($deviceserver.exposeDS) }}
   enableLoadBalancer: true
 {{- end }}