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 a24f8e81eaed04cbb7646a1a6d8264e24d8897e5..8337636fdde90589577bbba49531c95eae6bcc6a 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
@@ -25,6 +25,7 @@ import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
 import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
 import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService;
 import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
+import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
 import de.ozgcloud.apilib.vorgang.dummy.DummyVorgangService;
 import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
@@ -68,6 +69,15 @@ public class OzgCloudClientAutoConfiguration {
 		return properties;
 	}
 
+	@Bean
+	@ConditionalOnProperty("ozgcloud.command-manager.address")
+	GrpcChannelsProperties commandProperties() {
+		var properties = new GrpcChannelsProperties();
+		var clientMap = properties.getClient();
+		addCommandManager(clientMap);
+		return properties;
+	}
+
 	private void addVorgangManager(Map<String, GrpcChannelProperties> clientMap) {
 		var channelProps = new GrpcChannelProperties();
 		channelProps.setAddress(vorgangManagerProperties.getAddress());
@@ -123,9 +133,14 @@ public class OzgCloudClientAutoConfiguration {
 		return new DummyVorgangService();
 	}
 
+	@Bean
+	OzgCloudVorgangIdMapper ozgCloudVorgangIdMapper() {
+		return Mappers.getMapper(OzgCloudVorgangIdMapper.class);
+	}
+
 	@Bean
 	@ConditionalOnProperty("ozgcloud.command-manager.address")
-	OzgCloudCommandService grpcCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
+	OzgCloudCommandService grpcOzgCloudCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
 			CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
 		return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider);
 	}