diff --git a/elasticsearch/templates/configmap-etc.yaml b/elasticsearch/templates/configmap-etc.yaml
index 75637d01..532137b4 100644
--- a/elasticsearch/templates/configmap-etc.yaml
+++ b/elasticsearch/templates/configmap-etc.yaml
@@ -19,27 +19,7 @@ kind: ConfigMap
 metadata:
   name: elastic-etc
 data:
-  elasticsearch.yml: |
-{{ if .Values.conf.elasticsearch.override -}}
-{{ .Values.conf.elasticsearch.override | indent 4 }}
-{{- else -}}
-{{- if .Values.conf.elasticsearch.prefix -}}
-{{ .Values.conf.elasticsearch.prefix | indent 4 }}
-{{- end }}
-{{ tuple "etc/_elasticsearch.yml.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-{{- end }}
-{{- if .Values.conf.elasticsearch.append -}}
-{{ .Values.conf.elasticsearch.append | indent 4 }}
-{{- end }}
-  logging.yml: |
-{{ if .Values.conf.logging.override -}}
-{{ .Values.conf.logging.override | indent 4 }}
-{{- else -}}
-{{- if .Values.conf.logging.prefix -}}
-{{ .Values.conf.logging.prefix | indent 4 }}
-{{- end }}
-{{ tuple "etc/_logging.yml.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-{{- end }}
-{{- if .Values.conf.logging.append -}}
-{{ .Values.conf.logging.append | indent 4 }}
-{{- end }}
+  elasticsearch.yml: |+
+{{- tuple .Values.conf.elasticsearch "etc/_elasticsearch.yml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
+  logging.yml: |+
+{{- tuple .Values.conf.elasticsearch "etc/_logging.yml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
diff --git a/elasticsearch/templates/tests/pod-helm-tests.yaml b/elasticsearch/templates/tests/pod-helm-tests.yaml
index cebe68e9..ef2515c9 100644
--- a/elasticsearch/templates/tests/pod-helm-tests.yaml
+++ b/elasticsearch/templates/tests/pod-helm-tests.yaml
@@ -30,11 +30,12 @@ spec:
       - /tmp/helm-tests.sh
       env:
       - name: ELASTICSEARCH_ENDPOINT
-        value: {{ tuple "logging_db" "default" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
+        value: {{ tuple "logging_db" "internal" "client" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
       volumeMounts:
       - name: elastic-bin
         mountPath: /tmp/helm-tests.sh
         subPath: helm-tests.sh
+        readOnly: true
   volumes:
   - name: elastic-bin
     configMap:
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index a4cfefdb..af74e700 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -41,6 +41,7 @@ conf:
     append:
 
 endpoints:
+  cluster_domain_suffix: cluster.local
   logging_db:
     name: elasticsearch
     hosts:
@@ -48,12 +49,14 @@ endpoints:
       default: elasticsearch-logging
       discovery: elasticsearch-discovery
       public: elasticsearch
+    host_fqdn_override:
+      default: null
     path:
       default: null
     scheme:
       default: http
     port:
-      api:
+      client:
         default: 9200
 
 images:
diff --git a/fluentd/templates/configmap-etc.yaml b/fluentd/templates/configmap-etc.yaml
index bae3226b..38d872ae 100644
--- a/fluentd/templates/configmap-etc.yaml
+++ b/fluentd/templates/configmap-etc.yaml
@@ -22,8 +22,4 @@ metadata:
   name: fluentd-etc
 data:
   td-agent.conf: |+
-{{ if .Values.conf.fluentd.override -}}
-{{ .Values.conf.fluentd.override | indent 4 }}
-{{- else -}}
-{{ tuple "etc/_td-agent.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-{{- end }}
+{{- tuple .Values.conf.td_agent "etc/_td-agent.conf.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
diff --git a/fluentd/templates/tests/pod-helm-test.yaml b/fluentd/templates/tests/pod-helm-test.yaml
index 72a0f72b..ce6066ea 100644
--- a/fluentd/templates/tests/pod-helm-test.yaml
+++ b/fluentd/templates/tests/pod-helm-test.yaml
@@ -30,7 +30,7 @@ spec:
       - /tmp/fluentd-test.sh
       env:
       - name: ELASTICSEARCH_ENDPOINT
-        value: {{ tuple "log_database" "default" "client" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
+        value: {{ tuple "logging_db" "internal" "client" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
       volumeMounts:
       - name: fluentd-bin
         mountPath: /tmp/fluentd-test.sh
diff --git a/fluentd/values.yaml b/fluentd/values.yaml
index 30e933a2..46f03b5a 100644
--- a/fluentd/values.yaml
+++ b/fluentd/values.yaml
@@ -22,15 +22,18 @@ images:
   pull_policy: IfNotPresent
 
 conf:
-  fluentd:
+  td_agent:
     override:
 
 endpoints:
-  log_database:
+  cluster_domain_suffix: cluster.local
+  logging_db:
     name: elasticsearch
     hosts:
       default: elasticsearch-logging
       public: elasticsearch
+    host_fqdn_override:
+      default: null
     path:
       default: null
     scheme:
diff --git a/kibana/values.yaml b/kibana/values.yaml
index 54412a55..bb0303dd 100644
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -60,10 +60,13 @@ conf:
   append:
 
 endpoints:
+  cluster_domain_suffix: cluster.local
   log_database:
     hosts:
       default: elasticsearch-logging
       public: elasticsearch
+    host_fqdn_override:
+      default: null
     name: elasticsearch
     path:
       default: null
@@ -76,6 +79,8 @@ endpoints:
     hosts:
       default: kibana-dash
       public: kibana
+    host_fqdn_override:
+      default: null
     name: kibana
     path:
       default: null