diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java
index 6a1e4a22..d06b170e 100644
--- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java
+++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/LiteratureBrokerServiceConfiguration.java
@@ -53,7 +53,7 @@ public class LiteratureBrokerServiceConfiguration extends AbstractElasticsearchC
 	@Bean
 	public RestHighLevelClient elasticsearchClient() {
 		final ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-			.connectedTo(elasticSearchProperties.getClusterNodes())
+			.connectedTo(elasticSearchProperties.getClusterNodes().split(","))
 			.withConnectTimeout(elasticSearchProperties.getConnectionTimeout())
 			.withSocketTimeout(elasticSearchProperties.getSocketTimeout())
 			.build();
diff --git a/apps/dhp-broker-application/src/main/resources/application.properties b/apps/dhp-broker-application/src/main/resources/application.properties
index f485cfda..80595a9c 100644
--- a/apps/dhp-broker-application/src/main/resources/application.properties
+++ b/apps/dhp-broker-application/src/main/resources/application.properties
@@ -47,8 +47,6 @@ lbs.task.deleteOldEvents.cron           = 0 0 4 1/1 * ?
 lbs.task.deleteOldNotifications.cron    = 0 0 5 1/1 * ?
 lbs.task.subscriptionEventsMatcher.cron = 0 0 6 1/1 * ?
 
-spring.data.elasticsearch.cluster-name = ${lbs.elastic.clusterName}
-spring.data.elasticsearch.cluster-nodes = ${lbs.elastic.clusterNodes}
 
 
 
diff --git a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java
index ed3988c3..6f3a53d1 100644
--- a/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java
+++ b/apps/dhp-broker-public-application/src/main/java/eu/dnetlib/broker/BrokerConfiguration.java
@@ -48,7 +48,7 @@ public class BrokerConfiguration extends AbstractElasticsearchConfiguration {
 	@Bean
 	public RestHighLevelClient elasticsearchClient() {
 		final ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-			.connectedTo(elasticSearchProperties.getClusterNodes())
+			.connectedTo(elasticSearchProperties.getClusterNodes().split(","))
 			.withConnectTimeout(elasticSearchProperties.getConnectionTimeout())
 			.withSocketTimeout(elasticSearchProperties.getSocketTimeout())
 			.build();
diff --git a/apps/dhp-broker-public-application/src/main/resources/application.properties b/apps/dhp-broker-public-application/src/main/resources/application.properties
index 8a63cdbc..d1325010 100644
--- a/apps/dhp-broker-public-application/src/main/resources/application.properties
+++ b/apps/dhp-broker-public-application/src/main/resources/application.properties
@@ -39,8 +39,6 @@ lbs.task.deleteOldEvents.cron           = 0 0 4 1/1 * ?
 lbs.task.deleteOldNotifications.cron    = 0 0 5 1/1 * ?
 lbs.task.subscriptionEventsMatcher.cron = 0 0 6 1/1 * ?
 
-spring.data.elasticsearch.cluster-name = ${lbs.elastic.clusterName}
-spring.data.elasticsearch.cluster-nodes = ${lbs.elastic.clusterNodes}