diff --git a/pom.xml b/pom.xml
index 09294b4..c40bba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.open-elements</groupId>
         <artifactId>java-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>spring-services</artifactId>
diff --git a/spring-services-core/src/main/java/com/openelements/spring/base/security/SecurityConfig.java b/spring-services-core/src/main/java/com/openelements/spring/base/security/SecurityConfig.java
index 20981f5..3a31edc 100644
--- a/spring-services-core/src/main/java/com/openelements/spring/base/security/SecurityConfig.java
+++ b/spring-services-core/src/main/java/com/openelements/spring/base/security/SecurityConfig.java
@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -110,7 +111,8 @@ public JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint(
    */
   @Bean
   public ApiKeyAuthenticationFilter apiKeyAuthenticationFilter(
-      final JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint) {
+      @Qualifier("apiKeyAuthenticationEntryPoint")
+          final JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint) {
     return new ApiKeyAuthenticationFilter(apiKeyDataService, apiKeyAuthenticationEntryPoint);
   }
 
@@ -166,7 +168,8 @@ public JwtAuthenticationConverter jwtAuthenticationConverter() {
   public SecurityFilterChain externalApiFilterChain(
       final HttpSecurity http,
       final ApiKeyAuthenticationFilter apiKeyAuthenticationFilter,
-      final JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint)
+      @Qualifier("apiKeyAuthenticationEntryPoint")
+          final JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint)
       throws Exception {
     http.securityMatcher("/api/external/**")
         .authorizeHttpRequests(
@@ -202,7 +205,9 @@ public SecurityFilterChain externalApiFilterChain(
   @Bean
   @Order(2)
   public SecurityFilterChain defaultFilterChain(
-      final HttpSecurity http, final JsonAuthenticationEntryPoint jwtAuthenticationEntryPoint)
+      final HttpSecurity http,
+      @Qualifier("jwtAuthenticationEntryPoint")
+          final JsonAuthenticationEntryPoint jwtAuthenticationEntryPoint)
       throws Exception {
     http.authorizeHttpRequests(
             auth ->