diff --git a/src/main/java/eu/dnetlib/authentication/configuration/AuthenticationConfiguration.java b/src/main/java/eu/dnetlib/authentication/configuration/AuthenticationConfiguration.java
index 60dfa21..084e145 100644
--- a/src/main/java/eu/dnetlib/authentication/configuration/AuthenticationConfiguration.java
+++ b/src/main/java/eu/dnetlib/authentication/configuration/AuthenticationConfiguration.java
@@ -8,6 +8,9 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -62,4 +65,16 @@ public class AuthenticationConfiguration {
         restTemplate.getMessageConverters().add(converter);
         return restTemplate;
     }
+
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurerAdapter() {
+            @Override
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**")
+                        .allowedMethods("GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS")
+                        .allowCredentials(true);
+            }
+        };
+    }
 }
diff --git a/src/main/java/eu/dnetlib/authentication/security/CorsConfig.java b/src/main/java/eu/dnetlib/authentication/security/CorsConfig.java
deleted file mode 100644
index 39beacc..0000000
--- a/src/main/java/eu/dnetlib/authentication/security/CorsConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.dnetlib.authentication.security;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Configuration
-public class CorsConfig extends WebMvcConfigurerAdapter {
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedMethods("GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS")
-                .allowCredentials(true);
-    }
-}