diff --git a/elk_metrics_7x/roles/elastic_kibana/defaults/main.yml b/elk_metrics_7x/roles/elastic_kibana/defaults/main.yml
index 1cc8d10b..8c429108 100644
--- a/elk_metrics_7x/roles/elastic_kibana/defaults/main.yml
+++ b/elk_metrics_7x/roles/elastic_kibana/defaults/main.yml
@@ -36,3 +36,6 @@ kibana_elastic_endpoints:
 # kibana_reporting_encryption_key: ""
 # The key used to encrypt kibana session cookies
 # kibana_security_encryption_key: ""
+
+# The URL which users access Kibana from
+# kibana_base_url: ""
diff --git a/elk_metrics_7x/roles/elastic_kibana/templates/kibana.yml.j2 b/elk_metrics_7x/roles/elastic_kibana/templates/kibana.yml.j2
index 460e5fb7..db2f98b5 100644
--- a/elk_metrics_7x/roles/elastic_kibana/templates/kibana.yml.j2
+++ b/elk_metrics_7x/roles/elastic_kibana/templates/kibana.yml.j2
@@ -18,6 +18,12 @@ server.host: {{ kibana_interface }}
 # default to `true` starting in Kibana 7.0.
 #server.rewriteBasePath: false
 
+# Specifies the public URL at which Kibana is available for end users. If
+# `server.basePath` is configured this URL should end with the same basePath.
+{% if kibana_base_url is defined %}
+server.publicBaseUrl: "{{ kibana_base_url }}"
+{% endif %}
+
 # The maximum payload size in bytes for incoming server requests.
 #server.maxPayloadBytes: 1048576