diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java
index de0c54bb9e850ae50cd294cfd434b937f4665c1e..e1d333b7e663a813fceafb1446dd2484ab3f15bb 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java
@@ -61,6 +61,7 @@ public class CollaborationManagerConfiguration {
 	public static final String VORGANG_OZGCLOUD_SERVICE_NAME = "collaboration_OzgCloudVorgangService";
 	public static final String COLLABORATION_SERVICE_NAME = "collaboration_CollaborationService";
 	public static final String COLLABORATION_REQUEST_MAPPER_NAME = "collaboration_CollaborationRequestMapper";
+	public static final String FACHSTELLE_MAPPER_NAME = "collaboration_FachstelleMapper";
 	public static final String TEMPLATE_HANDLER_NAME = "collaboration_TemplateHandler";
 	public static final String VORGANG_ATTACHED_ITEM_REMOTE_SERVICE_NAME = "collaboration_VorgangAttachedItemRemoteService";
 	public static final String VORGANG_ATTACHED_ITEM_SERVICE_NAME = "collaboration_VorgangAttachedItemService";
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java
index af1774c59645e29dbf725b8ae7250d57ef9410b0..dfc9c6b47e81e77d881e7918e9be163bd1330648 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java
@@ -2,16 +2,19 @@ package de.ozgcloud.collaboration.fachstelle;
 
 import java.util.Map;
 
+import org.mapstruct.AnnotateWith;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ReportingPolicy;
+import org.springframework.stereotype.Component;
 
+import de.ozgcloud.collaboration.CollaborationManagerConfiguration;
 import de.ozgcloud.zufi.grpc.fachstelle.GrpcFachstelle;
 import de.ozgcloud.zufi.grpc.organisationseinheit.GrpcOrganisationsEinheit;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-
+@AnnotateWith(value = Component.class, elements = @AnnotateWith.Element(strings = CollaborationManagerConfiguration.FACHSTELLE_MAPPER_NAME))
 public interface FachstelleMapper {
 
 	@Mapping(target = "technicalId", source = "id")
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleRemoteService.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleRemoteService.java
index 2ed202a976adb525df4f7aa86bf2074852e057b5..d15023c0eb9d045d05e9bf4860720f1d0ce32e56 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleRemoteService.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleRemoteService.java
@@ -1,5 +1,6 @@
 package de.ozgcloud.collaboration.fachstelle;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import de.ozgcloud.collaboration.CollaborationManagerConfiguration;
@@ -18,6 +19,7 @@ class FachstelleRemoteService {
 	private final FachstelleServiceBlockingStub fachstelleServiceBlockingStub;
 	@GrpcClient(CollaborationManagerConfiguration.GRPC_ZUFI_MANAGER_NAME)
 	private final OrganisationsEinheitServiceBlockingStub organisationsEinheitServiceBlockingStub;
+	@Qualifier(CollaborationManagerConfiguration.FACHSTELLE_MAPPER_NAME) // NOSONAR
 	private final FachstelleMapper fachstelleMapper;
 
 	public Fachstelle getExterneFachstelle(String id) {