diff --git a/roles/docker-elk/templates/kibana.yml.j2 b/roles/docker-elk/templates/kibana.yml.j2
index 0e1dc60c..c091b82d 100644
--- a/roles/docker-elk/templates/kibana.yml.j2
+++ b/roles/docker-elk/templates/kibana.yml.j2
@@ -10,4 +10,4 @@ monitoring.ui.container.elasticsearch.enabled: true
 ## X-Pack security credentials
 #
 elasticsearch.username: elastic
-elasticsearch.password: changeme
+elasticsearch.password: {{elastic_search_password}}
diff --git a/roles/docker-elk/templates/logstash.conf.j2 b/roles/docker-elk/templates/logstash.conf.j2
index 7d5918ba..89853de6 100644
--- a/roles/docker-elk/templates/logstash.conf.j2
+++ b/roles/docker-elk/templates/logstash.conf.j2
@@ -14,7 +14,7 @@ output {
 	elasticsearch {
 		hosts => "elasticsearch:9200"
 		user => "elastic"
-		password => "changeme"
+		password => "{{elastic_search_password}}"
 		ecs_compatibility => disabled
 	}
 }
diff --git a/roles/docker-elk/templates/logstash.yml.j2 b/roles/docker-elk/templates/logstash.yml.j2
index a48c35ff..75c0a3d4 100644
--- a/roles/docker-elk/templates/logstash.yml.j2
+++ b/roles/docker-elk/templates/logstash.yml.j2
@@ -9,4 +9,4 @@ xpack.monitoring.elasticsearch.hosts: [ "http://elasticsearch:9200" ]
 #
 xpack.monitoring.enabled: true
 xpack.monitoring.elasticsearch.username: elastic
-xpack.monitoring.elasticsearch.password: changeme
+xpack.monitoring.elasticsearch.password: {{elastic_search_password}}