diff --git a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
index 2a2b6ab4d2585c1080b7f4c4516dafe22f1b35f9..aad5163de32534df7ea8a15c6e4fb0ea1c4ef50c 100644
--- a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
+++ b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
@@ -1,7 +1,6 @@
 package de.ozgcloud.client.autoconfigure;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 
@@ -10,10 +9,8 @@ import net.devh.boot.grpc.client.config.GrpcChannelProperties;
 import net.devh.boot.grpc.client.config.GrpcChannelsProperties;
 import net.devh.boot.grpc.client.config.NegotiationType;
 
-@AutoConfiguration
+@AutoConfiguration(before = GrpcClientAutoConfiguration.class)
 @ComponentScan(basePackages = "de.ozgcloud.apilib.**")
-@AutoConfigureBefore(GrpcClientAutoConfiguration.class)
-//TODO remove component scan
 public class OzgCloudClientAutoConfiguration {
 
 	@Bean