diff --git a/pom.xml b/pom.xml
index 13a199d40f3737d602ac99fcf858b825dc7ff810..fc4f3e84fce684a0166f4b9066732f5b48b1ba53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<description>OZG-Cloud Processor Manager</description>
 
 	<properties>
-		<vorgang-manager.version>2.15.0-PR-458-SNAPSHOT</vorgang-manager.version>
+		<vorgang-manager.version>2.17.0-PR-458-SNAPSHOT</vorgang-manager.version>
 		<api-lib.version>0.13.0-PR-31-SNAPSHOT</api-lib.version>
 		<tyrus-standalone-client.version>2.2.0</tyrus-standalone-client.version>
 		<okio.version>3.9.1</okio.version>
diff --git a/src/main/java/de/ozgcloud/processor/ProcessorManagerConfiguration.java b/src/main/java/de/ozgcloud/processor/ProcessorManagerConfiguration.java
index 3ce4b10271262235a40bfff7806e6699a32af0c4..769ede696d42b30f92dff964ab4826b3c57a6a2f 100644
--- a/src/main/java/de/ozgcloud/processor/ProcessorManagerConfiguration.java
+++ b/src/main/java/de/ozgcloud/processor/ProcessorManagerConfiguration.java
@@ -23,12 +23,14 @@
  */
 package de.ozgcloud.processor;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
 import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
+import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangQueryMapper;
 import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
 import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc;
 import net.devh.boot.grpc.client.inject.GrpcClient;
@@ -39,9 +41,10 @@ public class ProcessorManagerConfiguration {
 	@GrpcClient("vorgang-manager")
 	private VorgangServiceGrpc.VorgangServiceBlockingStub vorgangServiceStub;
 
+	@ConditionalOnProperty(prefix = "ozgcloud.processors[0]", name = "address")
 	@Bean("processorManager_OzgCloudCommandService")
 	OzgCloudVorgangService grpcOzgCloudCommandService(OzgCloudVorgangMapper vorgangMapper, OzgCloudVorgangStubMapper vorgangStubMapper,
-			ProzessorManagerCallContextProvider contextProvider) {
-		return new GrpcOzgCloudVorgangService(vorgangServiceStub, vorgangMapper, vorgangStubMapper, contextProvider);
+			OzgCloudVorgangQueryMapper vorgangQueryMapper, ProzessorManagerCallContextProvider contextProvider) {
+		return new GrpcOzgCloudVorgangService(vorgangServiceStub, vorgangMapper, vorgangStubMapper, vorgangQueryMapper, contextProvider);
 	}
 }
diff --git a/src/main/java/de/ozgcloud/processor/processor/ProcessorService.java b/src/main/java/de/ozgcloud/processor/processor/ProcessorService.java
index eae8780c99248b34ed1fda77d85bdb2a3e5e5d75..42f2a02a9d1dcb5ced61b9b191a031e1cba6c00b 100644
--- a/src/main/java/de/ozgcloud/processor/processor/ProcessorService.java
+++ b/src/main/java/de/ozgcloud/processor/processor/ProcessorService.java
@@ -6,6 +6,7 @@ import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
@@ -24,6 +25,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import reactor.core.publisher.Mono;
 
+@ConditionalOnProperty(prefix = "ozgcloud.processors[0]", name = "address")
 @Service
 @RequiredArgsConstructor
 @Log4j2
diff --git a/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java b/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java
index fdafb96cecae95f15fa0f5e2c6bce81dd943a089..dca2e610ff81292835bc9aa3ce2d2218eeb341c3 100644
--- a/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java
+++ b/src/main/java/de/ozgcloud/processor/vorgang/VorgangService.java
@@ -2,12 +2,14 @@ package de.ozgcloud.processor.vorgang;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
 import lombok.NonNull;
 
+@ConditionalOnProperty(prefix = "ozgcloud.processors[0]", name = "address")
 @Service("processorVorgangService")
 public class VorgangService {