diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java
index d558e90b454a4251f8b02db3559c4b0d9391ae11..b2f966267da101fc2a339ac2c9d17a84e58d36f2 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java
@@ -38,13 +38,13 @@ import org.springframework.stereotype.Service;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
+import de.ozgcloud.command.Command;
+import de.ozgcloud.common.errorhandling.TechnicalException;
 import de.ozgcloud.document.bescheid.Bescheid;
 import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
 import de.ozgcloud.document.bescheid.BescheidResponse;
-import de.ozgcloud.command.Command;
-import de.ozgcloud.document.common.attached_item.AttachedItemService;
 import de.ozgcloud.document.common.attached_item.AttachedItem;
-import de.ozgcloud.common.errorhandling.TechnicalException;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
 
 @Service
 public class DocumentService {
@@ -60,7 +60,7 @@ public class DocumentService {
 	@Autowired
 	private AttachedItemService attachedItemService;
 	@Autowired
-	@Qualifier("bescheid_OzgCloudCommandService")
+	@Qualifier(DocumentManagerConfiguration.COMMAND_SERVICE_NAME)
 	private OzgCloudCommandService commandService;
 	@Autowired
 	private CommandMapper commandMapper;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java
index 1e359c48249b333213d538ef5cc8d46dc6a5d7dd..70f4513613563583db235568f0871ff93e357e2b 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java
@@ -25,12 +25,14 @@ package de.ozgcloud.document.bescheid.common.user;
 
 import java.util.Optional;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import de.ozgcloud.apilib.user.OzgCloudUserId;
 import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
-import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
 import de.ozgcloud.common.errorhandling.TechnicalException;
+import de.ozgcloud.document.DocumentManagerConfiguration;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -38,11 +40,12 @@ import lombok.RequiredArgsConstructor;
 public class UserProfileService {
 
 	private final CurrentUserService currentUserService;
-	private final Optional<OzgCloudUserProfileService> userProfileService;
+	@Qualifier(DocumentManagerConfiguration.USER_PROFILE_SERVICE_NAME)
+	private final Optional<OzgCloudUserProfileService> ozgCloudUserProfileService;
 	private final UserProfileMapper mapper;
 
 	public UserProfile getUserProfile() {
-		var service = userProfileService.orElseThrow(() -> new IllegalStateException("No connection to user-manager configured."));
+		var service = ozgCloudUserProfileService.orElseThrow(() -> new IllegalStateException("No connection to user-manager configured."));
 
 		return currentUserService.getUser().getUserId().map(OzgCloudUserId::from)
 				.map(service::getById)