diff --git a/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java b/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java
index 2d7d3520..814701c9 100644
--- a/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java
+++ b/src/main/java/kcs/funding/fundingboost/elasticsearch/config/ElasticsearchConfig.java
@@ -1,19 +1,12 @@
 package kcs.funding.fundingboost.elasticsearch.config;
 
-import co.elastic.clients.elasticsearch.ElasticsearchClient;
-import co.elastic.clients.json.jackson.JacksonJsonpMapper;
-import co.elastic.clients.transport.ElasticsearchTransport;
-import co.elastic.clients.transport.rest_client.RestClientTransport;
-import org.apache.http.HttpHost;
-import org.elasticsearch.client.RestClient;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+import org.springframework.data.elasticsearch.client.ClientConfiguration;
+import org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration;
 
 @Configuration
-@EnableElasticsearchRepositories
-public class ElasticsearchConfig {
+public class ElasticsearchConfig extends ElasticsearchConfiguration {
 
     @Value("${spring.data.elasticsearch.host}")
     private String host;
@@ -21,20 +14,10 @@ public class ElasticsearchConfig {
     @Value("${spring.data.elasticsearch.port}")
     private int port;
 
-    @Bean
-    public RestClient restClient() {
-        return RestClient
-                .builder(new HttpHost(host, port, "http"))
+    @Override
+    public ClientConfiguration clientConfiguration() {
+        return ClientConfiguration.builder()
+                .connectedTo(host + ":" + port)
                 .build();
     }
-
-    @Bean
-    public ElasticsearchTransport elasticsearchTransport(RestClient restClient) {
-        return new RestClientTransport(restClient, new JacksonJsonpMapper());
-    }
-
-    @Bean
-    public ElasticsearchClient elasticsearchClient(ElasticsearchTransport transport) {
-        return new ElasticsearchClient(transport);
-    }
-}
+}
\ No newline at end of file