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 61cc836003338e2e5dec2076f4c115abab6c8f8f..c01e044f616f84902b73620ab25f7627700868d7 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
@@ -32,6 +32,7 @@ import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudEingangMapperImpl;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapperImpl;
+import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapperImpl;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
 import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
 import net.devh.boot.grpc.client.config.GrpcChannelProperties;
@@ -43,7 +44,8 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
 @Import({
 	GrpcOzgCloudFileService.class, DummyOzgCloudFileService.class,
 	OzgCloudCallContextAttachingInterceptor.class,
-	OzgCloudVorgangMapperImpl.class, OzgCloudEingangMapperImpl.class, OzgCloudVorgangIdMapperImpl.class
+	OzgCloudVorgangMapperImpl.class, OzgCloudEingangMapperImpl.class, OzgCloudVorgangIdMapperImpl.class,
+	OzgCloudVorgangStubMapperImpl.class
 })
 public class OzgCloudClientAutoConfiguration {
 
@@ -128,8 +130,12 @@ public class OzgCloudClientAutoConfiguration {
 
 	@Bean("ozgCloudVorgangService")
 	@ConditionalOnProperty("ozgcloud.vorgang-manager.address")
-	public OzgCloudVorgangService grpcOzgCloudVorgangService(VorgangServiceBlockingStub vorgangServiceStub, OzgCloudVorgangMapper mapper,
-		OzgCloudVorgangStubMapper stubMapper, OzgCloudCallContextProvider contextProvider) {
+	public OzgCloudVorgangService grpcOzgCloudVorgangService(
+		@GrpcClient("vorgang-manager") VorgangServiceBlockingStub vorgangServiceStub,
+		OzgCloudVorgangMapper mapper,
+		OzgCloudVorgangStubMapper stubMapper,
+		OzgCloudCallContextProvider contextProvider) {
+
 		return new GrpcOzgCloudVorgangService(vorgangServiceStub, mapper, stubMapper, contextProvider);
 	}