diff --git a/domain/src/main/java/fr/ippon/iroco2/domain/commons/model/Payload.java b/domain/src/main/java/fr/ippon/iroco2/domain/commons/model/Payload.java
index 7f867fd..69a92d4 100644
--- a/domain/src/main/java/fr/ippon/iroco2/domain/commons/model/Payload.java
+++ b/domain/src/main/java/fr/ippon/iroco2/domain/commons/model/Payload.java
@@ -29,11 +29,6 @@ public record Payload(
         int expectedPayloads,
         Map<PayloadConfiguration, String> configuredValues) {
     public String getValue(PayloadConfiguration key) {
-        return configuredValues == null ? null :
-                configuredValues.entrySet().stream()
-                        .filter(cv -> key == cv.getKey())
-                        .findFirst()
-                        .map(Map.Entry::getValue)
-                        .orElse(null);
+        return configuredValues == null ? null : configuredValues.get(key);
     }
 }
diff --git a/domain/src/test/java/fr/ippon/iroco2/domain/analyzer/AnalyzerSvcTest.java b/domain/src/test/java/fr/ippon/iroco2/domain/analyzer/AnalyzerSvcTest.java
index dac8a05..1b0337a 100644
--- a/domain/src/test/java/fr/ippon/iroco2/domain/analyzer/AnalyzerSvcTest.java
+++ b/domain/src/test/java/fr/ippon/iroco2/domain/analyzer/AnalyzerSvcTest.java
@@ -39,8 +39,8 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -72,7 +72,7 @@ class AnalyzerSvcTest {
     private AnalyzerSvcImpl analyzerSvc;
 
     private static Payload createPayload(UUID analysisId, int expectedPayloads) {
-        return new Payload(analysisId, "countryCode", "name", Duration.ZERO, expectedPayloads, new HashMap<>());
+        return new Payload(analysisId, "countryCode", "name", Duration.ZERO, expectedPayloads, Map.of());
     }
 
     private static Analysis createSavedAnalysis(String currentUser) {
diff --git a/domain/src/test/java/fr/ippon/iroco2/domain/commons/model/PayloadTest.java b/domain/src/test/java/fr/ippon/iroco2/domain/commons/model/PayloadTest.java
new file mode 100644
index 0000000..e412ca9
--- /dev/null
+++ b/domain/src/test/java/fr/ippon/iroco2/domain/commons/model/PayloadTest.java
@@ -0,0 +1,35 @@
+package fr.ippon.iroco2.domain.commons.model;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+class PayloadTest {
+
+    @Test
+    void should_return_null_when_configuredValues_is_null() {
+        // given
+        var payload = new Payload(null, null, null, null, 0, null);
+
+        //when
+        var actual = payload.getValue(PayloadConfiguration.S3_STORAGE);
+
+        // then
+        assertNull(actual);
+    }
+
+    @Test
+    void should_return_value_when_configuredValues_is_not_null() {
+        // given
+        var payload = new Payload(null, null, null, null, 0, Map.of(PayloadConfiguration.S3_STORAGE, "test"));
+
+        //when
+        var actual = payload.getValue(PayloadConfiguration.S3_STORAGE);
+
+        // then
+        assertEquals("test", actual);
+    }
+}
\ No newline at end of file
diff --git a/domain/src/test/java/fr/ippon/iroco2/domain/scanner/ScannerSvcTest.java b/domain/src/test/java/fr/ippon/iroco2/domain/scanner/ScannerSvcTest.java
index d2c520f..1a805cd 100644
--- a/domain/src/test/java/fr/ippon/iroco2/domain/scanner/ScannerSvcTest.java
+++ b/domain/src/test/java/fr/ippon/iroco2/domain/scanner/ScannerSvcTest.java
@@ -38,7 +38,7 @@
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -73,7 +73,7 @@ class ScannerSvcTest {
     private ScannerSvcImpl scannerSvc;
 
     private static Payload createPayload(UUID scan, int expectedPayloads) {
-        return new Payload(scan, "countryCode", "name", Duration.ZERO, expectedPayloads, new HashMap<>());
+        return new Payload(scan, "countryCode", "name", Duration.ZERO, expectedPayloads, Map.of());
     }
 
     private static Scan createSavedScan(String currentUser) {
diff --git a/infrastructure/src/main/java/fr/ippon/iroco2/access/jwt/JwtTokenPayload.java b/infrastructure/src/main/java/fr/ippon/iroco2/access/jwt/JwtTokenPayload.java
index f5aeac2..120723b 100644
--- a/infrastructure/src/main/java/fr/ippon/iroco2/access/jwt/JwtTokenPayload.java
+++ b/infrastructure/src/main/java/fr/ippon/iroco2/access/jwt/JwtTokenPayload.java
@@ -18,6 +18,7 @@
 package fr.ippon.iroco2.access.jwt;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 
diff --git a/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceCUR.java b/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceCUR.java
index 5e9b0d6..208086c 100644
--- a/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceCUR.java
+++ b/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceCUR.java
@@ -26,7 +26,7 @@
 import lombok.RequiredArgsConstructor;
 
 import java.time.Duration;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 @Getter
@@ -46,5 +46,5 @@ public final Payload toDomain() {
         return new Payload(UUID.fromString(correlationId), serviceTypeCUR.name(), AWSDataCenter.fromValue(awsDataCenter).getAssociatedCountryIsoCode(), durationOfServiceOperation, Math.toIntExact(numberOfMessageExpected), toConfiguredValuesDomain());
     }
 
-    protected abstract HashMap<PayloadConfiguration, String> toConfiguredValuesDomain();
+    protected abstract Map<PayloadConfiguration, String> toConfiguredValuesDomain();
 }
diff --git a/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceEC2CUR.java b/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceEC2CUR.java
index 0f53260..3629970 100644
--- a/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceEC2CUR.java
+++ b/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceEC2CUR.java
@@ -21,7 +21,7 @@
 import lombok.Getter;
 
 import java.time.Duration;
-import java.util.HashMap;
+import java.util.Map;
 
 @Getter
 public class ServiceEC2CUR extends ServiceCUR {
@@ -34,9 +34,7 @@ public ServiceEC2CUR(Duration durationOfServiceOperation, String awsDataCenter,
     }
 
     @Override
-    protected HashMap<PayloadConfiguration, String> toConfiguredValuesDomain() {
-        HashMap<PayloadConfiguration, String> config = new HashMap<>();
-        config.put(PayloadConfiguration.INSTANCE_TYPE, ec2Type);
-        return config;
+    protected Map<PayloadConfiguration, String> toConfiguredValuesDomain() {
+        return Map.of(PayloadConfiguration.INSTANCE_TYPE, ec2Type);
     }
 }
diff --git a/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceS3CUR.java b/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceS3CUR.java
index 09baf10..c409cf3 100644
--- a/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceS3CUR.java
+++ b/infrastructure/src/main/java/fr/ippon/iroco2/common/aws/cur/ServiceS3CUR.java
@@ -22,7 +22,7 @@
 
 import java.math.BigDecimal;
 import java.time.Duration;
-import java.util.HashMap;
+import java.util.Map;
 
 @Getter
 public class ServiceS3CUR extends ServiceCUR {
@@ -35,9 +35,7 @@ public ServiceS3CUR(Duration durationOfServiceOperation, String awsDataCenter, S
     }
 
     @Override
-    protected HashMap<PayloadConfiguration, String> toConfiguredValuesDomain() {
-        HashMap<PayloadConfiguration, String> config = new HashMap<>();
-        config.put(PayloadConfiguration.S3_STORAGE, storageInMo.toString());
-        return config;
+    protected Map<PayloadConfiguration, String> toConfiguredValuesDomain() {
+        return Map.of(PayloadConfiguration.S3_STORAGE, storageInMo.toString());
     }
 }
diff --git a/infrastructure/src/main/java/fr/ippon/iroco2/config/CURSseConfig.java b/infrastructure/src/main/java/fr/ippon/iroco2/config/CURSseConfig.java
index 59c745f..5680982 100644
--- a/infrastructure/src/main/java/fr/ippon/iroco2/config/CURSseConfig.java
+++ b/infrastructure/src/main/java/fr/ippon/iroco2/config/CURSseConfig.java
@@ -17,15 +17,15 @@
  */
 package fr.ippon.iroco2.config;
 
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 @Configuration
 public class CURSseConfig {
 
diff --git a/infrastructure/src/main/java/fr/ippon/iroco2/config/SecurityConfig.java b/infrastructure/src/main/java/fr/ippon/iroco2/config/SecurityConfig.java
index 7a63639..8b58ddc 100644
--- a/infrastructure/src/main/java/fr/ippon/iroco2/config/SecurityConfig.java
+++ b/infrastructure/src/main/java/fr/ippon/iroco2/config/SecurityConfig.java
@@ -47,7 +47,7 @@ public SecurityFilterChain securityFilterChain(
 
         log.debug("authentication activated? {}", authActivate);
 
-        return http.csrf(AbstractHttpConfigurer::disable)
+        return http
                 .addFilterBefore(scannerAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
                 .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
                 .authorizeHttpRequests(authorize ->
diff --git a/infrastructure/src/test/java/fr/ippon/iroco2/analyzer/primary/AnalyzerControllerTest.java b/infrastructure/src/test/java/fr/ippon/iroco2/analyzer/primary/AnalyzerControllerTest.java
index 2202cb9..771dd6a 100644
--- a/infrastructure/src/test/java/fr/ippon/iroco2/analyzer/primary/AnalyzerControllerTest.java
+++ b/infrastructure/src/test/java/fr/ippon/iroco2/analyzer/primary/AnalyzerControllerTest.java
@@ -17,9 +17,6 @@
  */
 package fr.ippon.iroco2.analyzer.primary;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import com.c4_soft.springaddons.security.oauth2.test.annotations.WithMockAuthentication;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/SecurityTestConfig.java b/infrastructure/src/test/java/fr/ippon/iroco2/config/SecurityTestConfig.java
similarity index 100%
rename from infrastructure/src/test/java/fr/ippon/iroco2/cucumber/SecurityTestConfig.java
rename to infrastructure/src/test/java/fr/ippon/iroco2/config/SecurityTestConfig.java
diff --git a/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/catalog/CatalogStepsDefinitions.java b/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/catalog/CatalogStepsDefinitions.java
index c851c79..58e54d6 100644
--- a/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/catalog/CatalogStepsDefinitions.java
+++ b/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/catalog/CatalogStepsDefinitions.java
@@ -17,9 +17,6 @@
  */
 package fr.ippon.iroco2.cucumber.catalog;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-
 import fr.ippon.iroco2.cucumber.common.SharedMockMvcResult;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
@@ -32,6 +29,9 @@
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.transaction.annotation.Transactional;
 
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+
 @SpringBootTest
 @Transactional
 public class CatalogStepsDefinitions {
diff --git a/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/catalog/CloudServiceProviderStepsDefinitions.java b/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/catalog/CloudServiceProviderStepsDefinitions.java
index 13e5193..61b3f1f 100644
--- a/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/catalog/CloudServiceProviderStepsDefinitions.java
+++ b/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/catalog/CloudServiceProviderStepsDefinitions.java
@@ -17,9 +17,6 @@
  */
 package fr.ippon.iroco2.cucumber.catalog;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import fr.ippon.iroco2.cucumber.common.SharedMockMvcResult;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
@@ -31,6 +28,9 @@
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.transaction.annotation.Transactional;
 
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 @SpringBootTest
 @Transactional
 public class CloudServiceProviderStepsDefinitions {
diff --git a/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/common/ResultStepDefinitions.java b/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/common/ResultStepDefinitions.java
index 8d2a2ad..cf866f8 100644
--- a/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/common/ResultStepDefinitions.java
+++ b/infrastructure/src/test/java/fr/ippon/iroco2/cucumber/common/ResultStepDefinitions.java
@@ -17,9 +17,6 @@
  */
 package fr.ippon.iroco2.cucumber.common;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import fr.ippon.iroco2.cucumber.infrastructure.SharedInfrastructureState;
 import io.cucumber.java.en.Then;
 import lombok.SneakyThrows;
@@ -28,6 +25,9 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.transaction.annotation.Transactional;
 
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 @SpringBootTest
 @Transactional
 public class ResultStepDefinitions {