diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java
index b74ca3dbe7a7635c43b307e75726c8fa995338e2..e9830c36e3822f814cdbb98ba361ad4404590869 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java
@@ -7,7 +7,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 
-import org.mapstruct.factory.Mappers;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
@@ -38,7 +37,7 @@ public class GrpcOzgCloudFileService implements OzgCloudFileService {
 	@GrpcClient("file-manager")
 	private final BinaryFileServiceStub asyncServiceStub;
 
-	private final OzgCloudFileMapper mapper = Mappers.getMapper(OzgCloudFileMapper.class);
+	private final OzgCloudFileMapper mapper;
 
 	static final int CHUNK_SIZE = 255 * 1024;
 
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java
index 2494c42838db6dbc4072b54a052d0d27388dd50d..c33b8be907de831a80250f673c72f304031f8d1b 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java
@@ -2,7 +2,6 @@ package de.ozgcloud.apilib.vorgang.grpc;
 
 import java.util.List;
 
-import org.mapstruct.factory.Mappers;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
@@ -28,8 +27,8 @@ public class GrpcOzgCloudVorgangService implements OzgCloudVorgangService {
 	@GrpcClient("vorgang-manager")
 	private final VorgangServiceBlockingStub vorgangServiceStub;
 
-	private OzgCloudVorgangMapper mapper = Mappers.getMapper(OzgCloudVorgangMapper.class);
-	private OzgCloudVorgangStubMapper stubMapper = Mappers.getMapper(OzgCloudVorgangStubMapper.class);
+	private final OzgCloudVorgangMapper mapper;
+	private final OzgCloudVorgangStubMapper stubMapper;
 
 	@Override
 	public OzgCloudVorgang getById(@NonNull OzgCloudVorgangId vorgangId) {
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java
index 68302989302c8094c1cab7ca7a222abd64ab64ef..ff27abc79bfa4fd74f3990e008d6c0a51ecc5b94 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java
@@ -32,10 +32,10 @@ class GrpcOzgCloudFileServiceTest {
 
 		@Nested
 		class CallGetFile {
-		@BeforeEach
-		void init() {
-			when(blockingStub.findBinaryFilesMetaData(any())).thenReturn(GrpcFindFilesResponse.newBuilder().addFile(GrpcOzgFileTestFactory.create()).build());
-		}
+			@BeforeEach
+			void init() {
+				when(blockingStub.findBinaryFilesMetaData(any())).thenReturn(GrpcFindFilesResponse.newBuilder().addFile(GrpcOzgFileTestFactory.create()).build());
+			}
 
 			@Test
 			void shouldCallStub() {
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 968338f9b69182ed2de918d9dd440d1e006d36a7..ff22489eab5521c856412157f54911823667f0c5 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
@@ -44,7 +44,7 @@ class OzgCloudVorgangMapperTest {
 			var mapped = mapper.fromGrpc(GrpcVorgangWithEingangTestFactory.create());
 
 			assertThat(mapped.getEingangs()).hasSize(1).first()
-					.usingRecursiveComparison()
+					.usingRecursiveComparison().ignoringFields("attachments")
 					.isEqualTo(OzgCloudVorgangEingangTestFactory.create());
 		}
 	}