diff --git a/tracedin-application/app-api/src/main/resources/application.yml b/tracedin-application/app-api/src/main/resources/application.yml
index 3aaa383..9b115ab 100644
--- a/tracedin-application/app-api/src/main/resources/application.yml
+++ b/tracedin-application/app-api/src/main/resources/application.yml
@@ -10,5 +10,4 @@ springdoc:
     default-models-expand-depth: -1
 server:
   shutdown: graceful
-  port: 8989
 
diff --git a/tracedin-infra/src/main/java/com/univ/tracedin/infra/elasticsearch/config/ElasticSearchConfig.java b/tracedin-infra/src/main/java/com/univ/tracedin/infra/elasticsearch/config/ElasticSearchConfig.java
index 53b8801..9efe976 100644
--- a/tracedin-infra/src/main/java/com/univ/tracedin/infra/elasticsearch/config/ElasticSearchConfig.java
+++ b/tracedin-infra/src/main/java/com/univ/tracedin/infra/elasticsearch/config/ElasticSearchConfig.java
@@ -10,11 +10,11 @@
 @EnableElasticsearchRepositories(basePackages = "com.univ.tracedin")
 public class ElasticSearchConfig extends ElasticsearchConfiguration {
 
-    @Value("${elasticsearch.host}")
-    private String host;
+    @Value("${elasticsearch.host-and-port}")
+    private String hostAndPort;
 
     @Override
     public ClientConfiguration clientConfiguration() {
-        return ClientConfiguration.builder().connectedTo(host).build();
+        return ClientConfiguration.builder().connectedTo(hostAndPort).build();
     }
 }
diff --git a/tracedin-infra/src/main/resources/application-infra.yml b/tracedin-infra/src/main/resources/application-infra.yml
index 4c8f436..6b32386 100644
--- a/tracedin-infra/src/main/resources/application-infra.yml
+++ b/tracedin-infra/src/main/resources/application-infra.yml
@@ -7,7 +7,7 @@ spring:
 elasticsearch:
   client:
     host: ${ELASTIC_HOST}
-  host: ${ELASTICSEARCH_HOST:localhost:9200}
+  host-and-port: ${ELASTICSEARCH_HOST:localhost:9200}
   port: 9200
 
 ---
@@ -19,5 +19,5 @@ spring:
 elasticsearch:
   client:
     host: ${ELASTIC_HOST}
-  host: ${ELASTICSEARCH_HOST:es:9200}
+  host-and-port: ${ELASTICSEARCH_HOST:es:9200}
   port: 9200