diff --git a/build/logstash/config/logstash-full.yml b/build/logstash/config/logstash-full.yml
index e87c29a..58e1a35 100644
--- a/build/logstash/config/logstash-full.yml
+++ b/build/logstash/config/logstash-full.yml
@@ -1,2 +1,2 @@
 http.host: "0.0.0.0"
-xpack.monitoring.elasticsearch.url: http://elasticsearch:9200
+xpack.monitoring.elasticsearch.hosts: [ "http://elasticsearch:9200" ]
diff --git a/build/logstash/env2yaml/env2yaml.go b/build/logstash/env2yaml/env2yaml.go
index c5309a9..507f73f 100644
--- a/build/logstash/env2yaml/env2yaml.go
+++ b/build/logstash/env2yaml/env2yaml.go
@@ -85,10 +85,10 @@ func normalizeSetting(setting string) (string, error) {
 		"path.plugins",
 		"xpack.monitoring.enabled",
 		"xpack.monitoring.collection.interval",
-		"xpack.monitoring.elasticsearch.url",
+		"xpack.monitoring.elasticsearch.hosts",
 		"xpack.monitoring.elasticsearch.username",
 		"xpack.monitoring.elasticsearch.password",
-		"xpack.monitoring.elasticsearch.ssl.ca",
+		"xpack.monitoring.elasticsearch.ssl.certificate_authority",
 		"xpack.monitoring.elasticsearch.ssl.truststore.path",
 		"xpack.monitoring.elasticsearch.ssl.truststore.password",
 		"xpack.monitoring.elasticsearch.ssl.keystore.path",
@@ -96,10 +96,10 @@ func normalizeSetting(setting string) (string, error) {
 		"xpack.management.enabled",
 		"xpack.management.logstash.poll_interval",
 		"xpack.management.pipeline.id",
-		"xpack.management.elasticsearch.url",
+		"xpack.management.elasticsearch.hosts",
 		"xpack.management.elasticsearch.username",
 		"xpack.management.elasticsearch.password",
-		"xpack.management.elasticsearch.ssl.ca",
+		"xpack.management.elasticsearch.ssl.certificate_authority",
 		"xpack.management.elasticsearch.ssl.truststore.path",
 		"xpack.management.elasticsearch.ssl.truststore.password",
 		"xpack.management.elasticsearch.ssl.keystore.path",
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 5d86df5..8852966 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -50,8 +50,8 @@ def test_disabling_java_execution_via_environment(logstash):
 
 def test_setting_elasticsearch_urls_as_an_array(logstash):
     setting_string = '["http://node1:9200","http://node2:9200"]'
-    logstash.restart(args='-e xpack.monitoring.elasticsearch.url=%s' % setting_string)
-    live_setting = logstash.get_settings()['xpack.monitoring.elasticsearch.url']
+    logstash.restart(args='-e xpack.monitoring.elasticsearch.hosts=%s' % setting_string)
+    live_setting = logstash.get_settings()['xpack.monitoring.elasticsearch.hosts']
     assert type(live_setting) is list
     assert 'http://node1:9200' in live_setting
     assert 'http://node2:9200' in live_setting