diff --git a/roles/elastic/defaults/main.yaml b/roles/elastic/defaults/main.yaml
index 66794da..61cc89e 100644
--- a/roles/elastic/defaults/main.yaml
+++ b/roles/elastic/defaults/main.yaml
@@ -1,13 +1,13 @@
 ---
 
 elastic_image_name: "docker.elastic.co/elasticsearch/elasticsearch"
-elastic_image_version: "7.12.0"
+elastic_image_version: "7.14.0"
 
 kibana_image_name: "docker.elastic.co/kibana/kibana"
-kibana_image_version: "7.12.0"
+kibana_image_version: "7.14.0"
 
 logstash_image_name: "docker.elastic.co/logstash/logstash"
-logstash_image_version: "7.12.0"
+logstash_image_version: "7.14.0"
 
 elasticsearch_exporter_image_name: "quay.io/prometheuscommunity/elasticsearch-exporter"
 elasticsearch_exporter_image_version: "latest"
diff --git a/roles/elastic/vars/main.yml b/roles/elastic/vars/main.yml
index 30848c0..448aebe 100644
--- a/roles/elastic/vars/main.yml
+++ b/roles/elastic/vars/main.yml
@@ -104,6 +104,7 @@ elastic_docker: {
       labels: "{{ kibana_labels + ( kibana_labels_additional | default([])) }}",
       environment: [
         "SERVER_NAME: {{ kibana_id }}",
+        "SERVER_PUBLICBASEURL: https://{{ stage_server_name }}-kibana.{{ domain }}",
         "ELASTICSEARCH_URL: https://{{ elastic_id }}:9200",
         "ELASTICSEARCH_HOSTS: '[\"https://{{ elastic_id }}:9200\"]'",
         "ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES: /usr/share/elasticsearch/config/certificates/ca/ca.crt",