diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java
index b2f3663a91b87d1834ee967e30c7320d6bb34165..23070d35c8c34630ed5c0e55f91fdab586ca6b8b 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java
@@ -1,10 +1,8 @@
 package de.ozgcloud.apilib.vorgang;
 
-import static org.mapstruct.MappingConstants.ComponentModel.*;
-
 import org.mapstruct.Mapper;
 
-@Mapper(componentModel = SPRING)
+@Mapper
 public interface OzgCloudVorgangIdMapper {
 
 	OzgCloudVorgangId fromString(String vorgangId);
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java
index 5fd6373bc58c66a7c8842f204990be54534a4af9..f024d80522b31d0859d2437b491e709ea198395b 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java
@@ -1,7 +1,5 @@
 package de.ozgcloud.apilib.vorgang.grpc;
 
-import static org.mapstruct.MappingConstants.ComponentModel.*;
-
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -17,7 +15,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudFormDataEntry;
 import de.ozgcloud.apilib.vorgang.OzgCloudFormField;
 import de.ozgcloud.apilib.vorgang.OzgCloudSubForm;
 
-@Mapper(componentModel = SPRING)
+@Mapper
 public interface OzgCloudEingangMapper {
 
 	// TODO map files
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java
index 115e72f232e7c4949bec87f0dd581a65b5e16a89..3973f7921f2383a8d1d8a477f8358d73f3f84cb4 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java
@@ -1,7 +1,5 @@
 package de.ozgcloud.apilib.vorgang.grpc;
 
-import static org.mapstruct.MappingConstants.ComponentModel.*;
-
 import java.util.Optional;
 
 import org.mapstruct.Mapper;
@@ -14,7 +12,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgang;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStatus;
 
-@Mapper(uses = { OzgCloudEingangMapper.class, OzgCloudVorgangIdMapper.class }, componentModel = SPRING)
+@Mapper(uses = { OzgCloudEingangMapper.class, OzgCloudVorgangIdMapper.class })
 public interface OzgCloudVorgangMapper {
 
 	@Mapping(target = "eingangs", ignore = true)
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 61488c5493cf6fd622b7cb843bbdce921c7ae1fe..0398793d591053f0b08406004bda2bacef499452 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,9 +25,11 @@ 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.OzgCloudVorgangIdMapperImpl;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
 import de.ozgcloud.apilib.vorgang.dummy.DummyVorgangService;
 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.OzgCloudVorgangStubMapper;
 import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
@@ -39,7 +41,8 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
 @ComponentScan("de.ozgcloud.client.autoconfigure")
 @Import({
 	GrpcOzgCloudFileService.class, DummyOzgCloudFileService.class,
-	OzgCloudCallContextAttachingInterceptor.class
+	OzgCloudCallContextAttachingInterceptor.class,
+	OzgCloudVorgangIdMapperImpl.class, OzgCloudEingangMapperImpl.class, OzgCloudVorgangIdMapperImpl.class
 })
 public class OzgCloudClientAutoConfiguration {