diff --git a/src/main/java/org/gridsuite/caseimport/server/CaseService.java b/src/main/java/org/gridsuite/caseimport/server/CaseService.java
index cef74f3..7a7afd1 100644
--- a/src/main/java/org/gridsuite/caseimport/server/CaseService.java
+++ b/src/main/java/org/gridsuite/caseimport/server/CaseService.java
@@ -7,6 +7,7 @@
 package org.gridsuite.caseimport.server;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.*;
 import org.springframework.http.client.MultipartBodyBuilder;
 import org.springframework.stereotype.Service;
@@ -33,9 +34,9 @@ public class CaseService {
     private String caseServerBaseUri;
 
     public CaseService(@Value("${powsybl.services.case-server.base-uri:http://case-server/}") String caseServerBaseUri,
-                       RestTemplate restTemplate) {
+                       RestTemplateBuilder restTemplateBuilder) {
         this.caseServerBaseUri = caseServerBaseUri;
-        this.restTemplate = restTemplate;
+        this.restTemplate = restTemplateBuilder.build();
     }
 
     public void setBaseUri(String caseServerBaseUri) {
diff --git a/src/main/java/org/gridsuite/caseimport/server/DirectoryService.java b/src/main/java/org/gridsuite/caseimport/server/DirectoryService.java
index 1249060..787a516 100644
--- a/src/main/java/org/gridsuite/caseimport/server/DirectoryService.java
+++ b/src/main/java/org/gridsuite/caseimport/server/DirectoryService.java
@@ -8,6 +8,7 @@
 
 import org.gridsuite.caseimport.server.dto.ElementAttributes;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -36,9 +37,10 @@ public class DirectoryService {
     public static final String ELEMENT = "ELEMENT";
 
     public DirectoryService(
-            @Value("${gridsuite.services.directory-server.base-uri:http://directory-server/}") String directoryServerBaseUri, RestTemplate restTemplate) {
+            @Value("${gridsuite.services.directory-server.base-uri:http://directory-server/}") String directoryServerBaseUri,
+            RestTemplateBuilder restTemplateBuilder) {
         this.directoryServerBaseUri = directoryServerBaseUri;
-        this.restTemplate = restTemplate;
+        this.restTemplate = restTemplateBuilder.build();
     }
 
     public void setDirectoryServerBaseUri(String directoryServerBaseUri) {
diff --git a/src/main/java/org/gridsuite/caseimport/server/RestTemplateConfig.java b/src/main/java/org/gridsuite/caseimport/server/RestTemplateConfig.java
deleted file mode 100644
index 2eb8b74..0000000
--- a/src/main/java/org/gridsuite/caseimport/server/RestTemplateConfig.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2023, RTE (http://www.rte-france.com)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-package org.gridsuite.caseimport.server;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * @author Abdelsalem Hedhili <abdelsalem.hedhili at rte-france.com>
- */
-@Configuration
-public class RestTemplateConfig {
-
-    @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
-}