diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangService.java
index af0ecd310a21c663d0256affbf0b040663f61945..e3d2e963109c4246e2563943d7e89a8b1329fb25 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangService.java
@@ -23,33 +23,25 @@
  */
 package de.ozgcloud.vorgang.vorgang;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 
 import io.grpc.stub.StreamObserver;
+import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.server.service.GrpcService;
 
 @GrpcService
+@RequiredArgsConstructor
 class GrpcVorgangService extends VorgangServiceGrpc.VorgangServiceImplBase {
 
-	@Autowired
-	private VorgangService vorgangService;
-	@Autowired
-	private VorgangHeaderService vorgangHeaderService;
-	@Autowired
-	private EingangMapper eingangMapper;
-	@Autowired
-	private VorgangHeaderMapper vorgangHeaderMapper;
-	@Autowired
-	private VorgangWithEingangMapper vorgangWithEingangMapper;
-	@Autowired
-	private FindVorgangRequestMapper findVorgangRequestMapper;
-	@Autowired
-	private FilterByMapper filterByMapper;
-	@Autowired
-	private IncomingFileMapper incomingFileMapper;
-	@Autowired
-	private IncomingFileGroupMapper incomingFileGroupMapper;
+	private final VorgangService vorgangService;
+	private final VorgangHeaderService vorgangHeaderService;
+	private final EingangMapper eingangMapper;
+	private final VorgangHeaderMapper vorgangHeaderMapper;
+	private final VorgangWithEingangMapper vorgangWithEingangMapper;
+	private final FindVorgangRequestMapper findVorgangRequestMapper;
+	private final FilterByMapper filterByMapper;
+	private final IncomingFileMapper incomingFileMapper;
+	private final IncomingFileGroupMapper incomingFileGroupMapper;
 
 	@Override
 	public void startCreation(GrpcCreateVorgangRequest request, StreamObserver<GrpcCreateVorgangResponse> responseObserver) {