diff --git a/libbeat/docs/shared-kibana-config.asciidoc b/libbeat/docs/shared-kibana-config.asciidoc
index 51ba2f0c3e2..0f72529efb8 100644
--- a/libbeat/docs/shared-kibana-config.asciidoc
+++ b/libbeat/docs/shared-kibana-config.asciidoc
@@ -35,7 +35,7 @@ Here is an example configuration:
 
 [source,yaml]
 ----
-setup.kibana.host: "localhost:5601"
+setup.kibana.host: "http://localhost:5601"
 ----
 
 [float]
@@ -71,7 +71,7 @@ Example config:
 [source,yaml]
 ----
 setup.kibana.host: "192.0.2.255:5601"
-setup.kibana.protocol: "https"
+setup.kibana.protocol: "http"
 setup.kibana.path: /kibana
 ----
 
@@ -109,8 +109,7 @@ Example configuration:
 
 [source,yaml]
 ----
-setup.kibana.host: "192.0.2.255:5601"
-setup.kibana.protocol: "https"
+setup.kibana.host: "https://192.0.2.255:5601"
 setup.kibana.ssl.enabled: true
 setup.kibana.ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
 setup.kibana.ssl.certificate: "/etc/pki/client/cert.pem"
diff --git a/libbeat/docs/shared-ssl-config.asciidoc b/libbeat/docs/shared-ssl-config.asciidoc
index 6034a924826..0956230946a 100644
--- a/libbeat/docs/shared-ssl-config.asciidoc
+++ b/libbeat/docs/shared-ssl-config.asciidoc
@@ -13,7 +13,7 @@ Example output config with SSL enabled:
 
 [source,yaml]
 ----
-output.elasticsearch.hosts: ["192.168.1.42:9200"]
+output.elasticsearch.hosts: ["https://192.168.1.42:9200"]
 output.elasticsearch.ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
 output.elasticsearch.ssl.certificate: "/etc/pki/client/cert.pem"
 output.elasticsearch.ssl.key: "/etc/pki/client/cert.key"
@@ -27,8 +27,7 @@ Example Kibana endpoint config with SSL enabled:
 
 [source,yaml]
 ----
-setup.kibana.host: "192.0.2.255:5601"
-setup.kibana.protocol: "https"
+setup.kibana.host: "https://192.0.2.255:5601"
 setup.kibana.ssl.enabled: true
 setup.kibana.ssl.certificate_authorities: ["/etc/pki/root/ca.pem"]
 setup.kibana.ssl.certificate: "/etc/pki/client/cert.pem"
diff --git a/metricbeat/docs/modules/elasticsearch.asciidoc b/metricbeat/docs/modules/elasticsearch.asciidoc
index a382b6fc091..807ae59f2aa 100644
--- a/metricbeat/docs/modules/elasticsearch.asciidoc
+++ b/metricbeat/docs/modules/elasticsearch.asciidoc
@@ -37,7 +37,7 @@ metricbeat.modules:
     #- shard
     #- ml_job
   period: 10s
-  hosts: ["localhost:9200"]
+  hosts: ["http://localhost:9200"]
 
   # Set to false to fetch all entries
   #index_recovery.active_only: true
diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
index 169c3b975c9..81ea7a75c24 100644
--- a/metricbeat/metricbeat.reference.yml
+++ b/metricbeat/metricbeat.reference.yml
@@ -204,7 +204,7 @@ metricbeat.modules:
     #- shard
     #- ml_job
   period: 10s
-  hosts: ["localhost:9200"]
+  hosts: ["http://localhost:9200"]
 
   # Set to false to fetch all entries
   #index_recovery.active_only: true
diff --git a/metricbeat/module/elasticsearch/_meta/config.reference.yml b/metricbeat/module/elasticsearch/_meta/config.reference.yml
index f813caa83eb..67640a1ead6 100644
--- a/metricbeat/module/elasticsearch/_meta/config.reference.yml
+++ b/metricbeat/module/elasticsearch/_meta/config.reference.yml
@@ -8,7 +8,7 @@
     #- shard
     #- ml_job
   period: 10s
-  hosts: ["localhost:9200"]
+  hosts: ["http://localhost:9200"]
 
   # Set to false to fetch all entries
   #index_recovery.active_only: true
diff --git a/metricbeat/module/elasticsearch/_meta/config.yml b/metricbeat/module/elasticsearch/_meta/config.yml
index 1d7db8b1c11..4a9dde67ad6 100644
--- a/metricbeat/module/elasticsearch/_meta/config.yml
+++ b/metricbeat/module/elasticsearch/_meta/config.yml
@@ -3,6 +3,6 @@
   #  - node
   #  - node_stats
   period: 10s
-  hosts: ["localhost:9200"]
+  hosts: ["http://localhost:9200"]
   #username: "user"
   #password: "secret"
diff --git a/metricbeat/modules.d/elasticsearch.yml.disabled b/metricbeat/modules.d/elasticsearch.yml.disabled
index 112c9cebed7..271f927e301 100644
--- a/metricbeat/modules.d/elasticsearch.yml.disabled
+++ b/metricbeat/modules.d/elasticsearch.yml.disabled
@@ -6,6 +6,6 @@
   #  - node
   #  - node_stats
   period: 10s
-  hosts: ["localhost:9200"]
+  hosts: ["http://localhost:9200"]
   #username: "user"
   #password: "secret"