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 23070d35c8c34630ed5c0e55f91fdab586ca6b8b..b2f3663a91b87d1834ee967e30c7320d6bb34165 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,8 +1,10 @@
 package de.ozgcloud.apilib.vorgang;
 
+import static org.mapstruct.MappingConstants.ComponentModel.*;
+
 import org.mapstruct.Mapper;
 
-@Mapper
+@Mapper(componentModel = SPRING)
 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 f024d80522b31d0859d2437b491e709ea198395b..5fd6373bc58c66a7c8842f204990be54534a4af9 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,5 +1,7 @@
 package de.ozgcloud.apilib.vorgang.grpc;
 
+import static org.mapstruct.MappingConstants.ComponentModel.*;
+
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -15,7 +17,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudFormDataEntry;
 import de.ozgcloud.apilib.vorgang.OzgCloudFormField;
 import de.ozgcloud.apilib.vorgang.OzgCloudSubForm;
 
-@Mapper
+@Mapper(componentModel = SPRING)
 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 3973f7921f2383a8d1d8a477f8358d73f3f84cb4..115e72f232e7c4949bec87f0dd581a65b5e16a89 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,5 +1,7 @@
 package de.ozgcloud.apilib.vorgang.grpc;
 
+import static org.mapstruct.MappingConstants.ComponentModel.*;
+
 import java.util.Optional;
 
 import org.mapstruct.Mapper;
@@ -12,7 +14,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 })
+@Mapper(uses = { OzgCloudEingangMapper.class, OzgCloudVorgangIdMapper.class }, componentModel = SPRING)
 public interface OzgCloudVorgangMapper {
 
 	@Mapping(target = "eingangs", ignore = true)
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java
index ff22489eab5521c856412157f54911823667f0c5..197b54dfe9e8a549b39924c54e172cda05a7d139 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java
@@ -10,6 +10,7 @@ import org.mockito.Spy;
 
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangEingangTestFactory;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangHeaderTestFactory;
+import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
 
 class OzgCloudVorgangMapperTest {
@@ -19,6 +20,8 @@ class OzgCloudVorgangMapperTest {
 
 	@Spy
 	private OzgCloudEingangMapper eingangMapper = Mappers.getMapper(OzgCloudEingangMapper.class);
+	@Spy
+	private OzgCloudVorgangIdMapper idMapper = Mappers.getMapper(OzgCloudVorgangIdMapper.class);
 
 	@Nested
 	class TestFromGrpc {