diff --git a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml
index 2bd4590d4..ad2382631 100644
--- a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -69,11 +69,6 @@ spec:
                 secretKeyRef:
                   name: mysql-exporter-secrets
                   key: EXPORTER_PASSWORD
-            - name: DATA_SOURCE_NAME
-              valueFrom:
-                secretKeyRef:
-                  name: mysql-exporter-secrets
-                  key: DATA_SOURCE_NAME
             - name: POD_IP
               valueFrom:
                 fieldRef:
diff --git a/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl b/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl
index cd31a6671..c86fc01f2 100644
--- a/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl
+++ b/mariadb/templates/monitoring/prometheus/secrets/_exporter_user.cnf.tpl
@@ -15,11 +15,10 @@ limitations under the License.
 [client]
 user = {{ .Values.endpoints.oslo_db.auth.exporter.username }}
 password = {{ .Values.endpoints.oslo_db.auth.exporter.password }}
-host = {{ tuple "oslo_db" "direct" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
+host = {{ tuple "oslo_db" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
 port = {{ tuple "oslo_db" "direct" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{- if .Values.manifests.certificates }}
 ssl-ca = /etc/mysql/certs/ca.crt
 ssl-key = /etc/mysql/certs/tls.key
 ssl-cert = /etc/mysql/certs/tls.crt
 {{- end }}
-
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 6c17bf5e3..c19987a18 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -24,7 +24,7 @@ images:
     ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
     error_pages: gcr.io/google_containers/defaultbackend:1.4
     prometheus_create_mysql_user: docker.io/mariadb:10.2.31
-    prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0
+    prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.11.0
     prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0