diff --git a/src/main/java/org/gridsuite/merge/orchestrator/server/MergeOrchestratorApplication.java b/src/main/java/org/gridsuite/merge/orchestrator/server/MergeOrchestratorApplication.java
index 77f440b..51d04e4 100644
--- a/src/main/java/org/gridsuite/merge/orchestrator/server/MergeOrchestratorApplication.java
+++ b/src/main/java/org/gridsuite/merge/orchestrator/server/MergeOrchestratorApplication.java
@@ -14,17 +14,14 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 
 /**
  * @author Jon Harper <jon.harper at rte-france.com>
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
  */
 @SuppressWarnings("checkstyle:HideUtilityClassConstructor")
-@SpringBootApplication
-@ComponentScan(basePackageClasses = {MergeOrchestratorApplication.class, NetworkStoreService.class})
+@SpringBootApplication(scanBasePackageClasses = { MergeOrchestratorApplication.class, NetworkStoreService.class })
 public class MergeOrchestratorApplication {
-
     public static void main(String[] args) {
         Utils.initProperties();
         SpringApplication.run(MergeOrchestratorApplication.class, args);