diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml
index d52dc8cc59d036706125e17cae907063640b2280..031cfac2dfc9efe5f2fc146c3ebf9f579bf4117a 100644
--- a/alfa-client/apps/alfa-e2e/docker-compose.yml
+++ b/alfa-client/apps/alfa-e2e/docker-compose.yml
@@ -36,15 +36,15 @@ services:
     image: docker.ozg-sh.de/vorgang-manager:${VORGANG_MANAGER_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
-      - SPRING_DATA_MONGODB_HOST=ozg-mongodb
+      - SPRING_DATA_MONGODB_HOST=mongodb
       - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-dev,e2e}
       - logging_level_org_springframework_security=${LOGGING_LEVEL:-WARN}
-      - OZGCLOUD_ELASTICSEARCH_ADDRESS=ozg-elastic:9200
+      - OZGCLOUD_ELASTICSEARCH_ADDRESS=elastic:9200
       - OZGCLOUD_ELASTICSEARCH_USERNAME=elastic
       - OZGCLOUD_ELASTICSEARCH_PASSWORD=password
       - OZGCLOUD_ELASTICSEARCH_INDEX=e2e-test-index
       - OZGCLOUD_ELASTICSEARCH_USESSL=false
-      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://ozg-usermanager:9000
+      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://user-manager:9000
       - GRPC_CLIENT_USER_MANAGER_NEGOTIATION_TYPE=PLAINTEXT
       - OZGCLOUD_USERMANAGER_URL=http://localhost:9092/migration/user
       - OZGCLOUD_PROCESSORS_0_ADDRESS=http://smocker:5080/externe-processor-success
@@ -52,17 +52,17 @@ services:
     ports:
       - 9091:9090
     depends_on:
-      ozg-mongodb:
+      mongodb:
         condition: service_started
-      ozg-elastic:
+      elastic:
         condition: service_healthy
 
   alfa:
-    image: docker.ozg-sh.de/alfa:PR-326-1.17.0-SNAPSHOT
+    image: docker.ozg-sh.de/alfa:${ALFA_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
-      - GRPC_CLIENT_VORGANG_MANAGER_ADDRESS=static://ozg-vorgang-manager:9090
-      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://ozg-usermanager:9000
+      - GRPC_CLIENT_VORGANG_MANAGER_ADDRESS=static://vorgang-manager:9090
+      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://user-manager:9000
       - GRPC_CLIENT_USER_MANAGER_NEGOTIATION_TYPE=PLAINTEXT
       - SPRING_PROFILES_ACTIVE=remotekc, e2e
       - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
@@ -80,8 +80,8 @@ services:
     ports:
       - 8080:8080
     depends_on:
-      - ozg-vorgang-manager
-      - ozg-usermanager
+      - vorgang-manager
+      - user-manager
 
   elastic:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.3.2
@@ -108,8 +108,8 @@ services:
       timeout: 10s
       retries: 5
 
-  usermanager:
-    image: docker.ozg-sh.de/user-manager:${USERMANAGER_DOCKER_IMAGE:-snapshot-latest}
+  user-manager:
+    image: docker.ozg-sh.de/user-manager:${USER_MANAGER_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
       - QUARKUS_HTTP_CORS_ORIGINS=http://localhost:4300,http://127.0.0.1:4300,https://e2e.dev.by.ozg-cloud.de
@@ -123,7 +123,7 @@ services:
       - OZGCLOUD_KEYCLOAK_SYNC_CRON={OZGCLOUD_KEYCLOAK_SYNC_CRON:-disabled}
       - KEYCLOAK_URL=https://sso.dev.by.ozg-cloud.de
       - OZGCLOUD_USER_MANAGER_URL=http://localhost:9092
-      - QUARKUS_MONGODB_CONNECTION_STRING=mongodb://ozg-mongodb:27017
+      - QUARKUS_MONGODB_CONNECTION_STRING=mongodb://mongodb:27017
       - QUARKUS_MONGODB_DATABASE=usermanager
       - quarkus.log.category."io.quarkus.oidc.runtime.OidcProvider".level=TRACE
       - quarkus.log.category."io.quarkus.oidc.runtime.OidcProvider".min-level=TRACE
@@ -132,7 +132,7 @@ services:
     ports:
       - 9092:8080
     depends_on:
-      - ozg-mongodb
+      - mongodb
 
   smocker:
     image: thiht/smocker
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts
index feafeb0b2895bbae5b322fd5fecec77e61ce4974..a028a4d67f1b36e6731da7eeb0b405e43eae42bb 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts
@@ -122,7 +122,7 @@ describe.skip('Historie', () => {
 				subject: 'AW: Send Postfach Nachricht',
 				direction: DirectionE2E.IN
 			},
-			client: 'MailService',
+			client: 'OzgCloud_NachrichtenManager',
 			vorgangId: vorgang._id.$oid
 		},
 		createdBy: null,
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/postfach-mail/postfach-mail.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/postfach-mail/postfach-mail.cy.ts
index 072d544ed2b4721f67ed2f9110e748071e76ab91..7893c57577efbf5a566b00a5fde183a21badd6e5 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/postfach-mail/postfach-mail.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/postfach-mail/postfach-mail.cy.ts
@@ -59,7 +59,7 @@ describe('PostfachMail', () => {
 	const postfachMailPage: PostfachMailPage = new PostfachMailPage();
 
 	const clientAttributes: ClientAttributesE2E = {
-		[VorgangAttachedItemClientE2E.KOP_NACHRICHTEN_MANAGER]: {
+		[VorgangAttachedItemClientE2E.OZGCLOUD_NACHRICHTEN_MANAGER]: {
 			[ClientAttributeNameE2E.HAS_NEW_POSTFACH_NACHRICHT]: createHasNewPostfachNachrichtClientAttribute(true),
 			[ClientAttributeNameE2E.HAS_POSTFACH_NACHRICHT]: createHasPostfachNachrichtClientAttribute(true)
 		}
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/vorgang/vorgang-attached-item.json b/alfa-client/apps/alfa-e2e/src/fixtures/vorgang/vorgang-attached-item.json
index c41a3a971faf4e76abcfaff90af7d4798abc825a..50dd96dd38e5148faa317450ab3397f4f3bd8a8e 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/vorgang/vorgang-attached-item.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/vorgang/vorgang-attached-item.json
@@ -3,7 +3,7 @@
 		"$oid": "602566a807bb665df9a86111"
 	},
 	"version": 0,
-	"client": "MailService",
+	"client": "OzgCloud_NachrichtenManager",
 	"vorgangId": "602566a807bb665df9a86111",
 	"itemName": "PostfachMail",
 	"item": {
diff --git a/alfa-client/apps/alfa-e2e/src/model/vorgang-attached-item.ts b/alfa-client/apps/alfa-e2e/src/model/vorgang-attached-item.ts
index 74fe3ecd9119207b6e1979a38fa2d2030e7db0b8..b55fc34594c3f5eed5a0d3ab0e6d91c76f32efee 100644
--- a/alfa-client/apps/alfa-e2e/src/model/vorgang-attached-item.ts
+++ b/alfa-client/apps/alfa-e2e/src/model/vorgang-attached-item.ts
@@ -27,8 +27,7 @@ import { WiedervorlageE2E } from './wiedervorlage';
 
 export enum VorgangAttachedItemClientE2E {
 	ALFA = 'Alfa',
-	MAIL_SERVICE = 'MailService',
-	KOP_NACHRICHTEN_MANAGER = 'KopNachrichtenManager'
+	OZGCLOUD_NACHRICHTEN_MANAGER = 'OzgCloud_NachrichtenManager'
 }
 
 export enum VorgangAttachedItemNameE2E {
diff --git a/alfa-client/apps/alfa-e2e/src/support/vorgang-attached-item-util.ts b/alfa-client/apps/alfa-e2e/src/support/vorgang-attached-item-util.ts
index dd792cb91798e231ed06ed8680747a9379490a64..c99aa57229dccf24f39937049eb6860817c8d292 100644
--- a/alfa-client/apps/alfa-e2e/src/support/vorgang-attached-item-util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/vorgang-attached-item-util.ts
@@ -68,7 +68,7 @@ export function createPostfachNachrichtAttachedItem(_id: string, vorgangId: stri
 		_id: { $oid: _id },
 		version: 0,
 		vorgangId,
-		client: VorgangAttachedItemClientE2E.MAIL_SERVICE,
+		client: VorgangAttachedItemClientE2E.OZGCLOUD_NACHRICHTEN_MANAGER,
 		itemName: VorgangAttachedItemNameE2E.POSTFACH_NACHRICHT,
 		item: {
 			...createPostfachNachrichtReplyItem(),
diff --git a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh
index 547196a435f93c84cabbf0be898896c254f257c4..313de4ccbb708485a795958aee88f6e1c945dc01 100755
--- a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh
+++ b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh
@@ -40,12 +40,12 @@ then
 	export DOCKER_GATEWAY_HOST=172.17.0.1
 fi
 
-docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d ozg-mongodb ozg-usermanager ozg-elastic ozg-smocker --wait
+docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d mongodb user-manager elastic smocker --wait
 
 echo
 echo "Starting VorgangManager to init search index."
 
-SPRING_PROFILE=dev,e2e,initSearchIndex docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d ozg-pluto
+SPRING_PROFILE=dev,e2e,initSearchIndex docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d vorgang-manager
 echo
 
 waitForInitSearchIndex() {
@@ -63,14 +63,14 @@ echo
 echo
 echo "Starting VorgangManager and Alfa Server for normal operations."
 
-SPRING_PROFILE=dev,e2e docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d ozg-pluto ozg-goofy
+SPRING_PROFILE=dev,e2e docker compose -f ${SCRIPT_DIR}/docker-compose.yml up -d vorgang-manager alfa
 
 waitForServerStarted() {
-	(docker compose -f ${SCRIPT_DIR}/docker-compose.yml logs | awk 'BEGIN{RS="\0"} /Started AlfaServerApplication/ && /Started PlutoServerApplication/ { exit 1 }')
+	(docker compose -f ${SCRIPT_DIR}/docker-compose.yml logs | awk 'BEGIN{RS="\0"} /Started AlfaServerApplication/ && /Started VorgangManagerServerApplication/ { exit 1 }')
 }
 
 echo
-echo "Waiting for Pluto and Alfa Server to log successful start."
+echo "Waiting for VorgangManager and Alfa Server to log successful start."
 while waitForServerStarted
 do
 	echo -n "."
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java
index 99efbe3761e470d24c87e75733fa361a832b7191..b64a40cab936be2d548e684e8e54e316b4b0eafc 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java
@@ -34,7 +34,7 @@ import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcUpdateClientAttributeRequest
 public class ClientAttributeService {
 
 	public static final String HAS_NEW_POSTFACH_NACHRICHT_ATTRIBUTE_NAME = "hasNewPostfachNachricht";
-	static final String ORIGINAL_CLIENT_NAME = "KopNachrichtenManager";
+	static final String ORIGINAL_CLIENT_NAME = "OzgCloud_NachrichtenManager";
 
 	@Autowired
 	private ClientAttributeRemoteService remoteService;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieCommandHandler.java b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieCommandHandler.java
index fe54b77f7a60a44ac005f05864c7819587701b36..a3ebb71043e0164d767ad363b953a72ebe0cc02f 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieCommandHandler.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/historie/HistorieCommandHandler.java
@@ -49,7 +49,7 @@ class HistorieCommandHandler {
 	static final String DIRECTION_INCOMMING = "IN";
 	static final String DIRECTION_OUTGOING = "OUT";
 	static final String DIRECTION = "direction";
-	static final String MAIL_SERVICE = "MailService";
+	static final String OZGCLOUD_NACHRICHTEN_MANAGER = "OzgCloud_NachrichtenManager";
 	static final String CLIENT = "client";
 
 	private static final Predicate<Command> IS_CREATE_ATTACHED_ITEM = command -> command.getOrder() == CommandOrder.CREATE_ATTACHED_ITEM;
@@ -61,7 +61,7 @@ class HistorieCommandHandler {
 	private CommandService commandService;
 
 	public boolean isHistorieCommand(Command command) {
-		return !isOutgoingPostfachNachrichtByMailService(command)
+		return !isOutgoingPostfachNachrichtByOzgCloudNachrichtenManager(command)
 				&& !isCreateLoeschAnforderungVorgangAttachedItem(command)
 				&& !isLoeschAnforderungZuruecknehmenRevoked(command)
 				&& !isDeleteVorgangAttachedItem(command);
@@ -71,12 +71,12 @@ class HistorieCommandHandler {
 		return command.getOrder() == CommandOrder.DELETE_ATTACHED_ITEM;
 	}
 
-	boolean isOutgoingPostfachNachrichtByMailService(Command command) {
-		return command.getOrder().equals(CommandOrder.CREATE_ATTACHED_ITEM) && isMailService(command) && isOutgoing(command);
+	boolean isOutgoingPostfachNachrichtByOzgCloudNachrichtenManager(Command command) {
+		return command.getOrder().equals(CommandOrder.CREATE_ATTACHED_ITEM) && isOzgCloudNachrichtenManager(command) && isOutgoing(command);
 	}
 
-	private boolean isMailService(Command command) {
-		return StringUtils.equals(MapUtils.getString(command.getBody(), CLIENT), MAIL_SERVICE);
+	private boolean isOzgCloudNachrichtenManager(Command command) {
+		return StringUtils.equals(MapUtils.getString(command.getBody(), CLIENT), OZGCLOUD_NACHRICHTEN_MANAGER);
 	}
 
 	private boolean isOutgoing(Command command) {
@@ -129,7 +129,7 @@ class HistorieCommandHandler {
 				resultBuilder.order(CommandOrder.CREATE_KOMMENTAR).build();
 			} else if (name.equals(Wiedervorlage.class.getSimpleName())) {
 				resultBuilder.order(CommandOrder.CREATE_WIEDERVORLAGE).build();
-			} else if (isMailService(command) && isIncomming(command)) {
+			} else if (isOzgCloudNachrichtenManager(command) && isIncomming(command)) {
 				resultBuilder.order(CommandOrder.RECEIVE_POSTFACH_NACHRICHT).build();
 			}
 		});
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java
index 81d1c6a0c3dc8f3724a39759aea1277e38cc26be..c52a4d2b88fd165f0e9d89c0e550b37579384b32 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/historie/HistorieCommandHandlerTest.java
@@ -111,18 +111,18 @@ class HistorieCommandHandlerTest {
 
 	@DisplayName("postfach nachricht verification")
 	@Nested
-	class TestIsOutgoingPostfachNachrichtenByMailService {
+	class TestIsOutgoingPostfachNachrichtenByOzgCloudNachrichtenManager {
 
 		private final Command matchingCommand = CommandTestFactory.createBuilder()
 				.order(CommandOrder.CREATE_ATTACHED_ITEM)
 				.body(Map.of("item", Map.of(HistorieCommandHandler.DIRECTION, HistorieCommandHandler.DIRECTION_OUTGOING),
-						HistorieCommandHandler.CLIENT, HistorieCommandHandler.MAIL_SERVICE))
+						HistorieCommandHandler.CLIENT, HistorieCommandHandler.OZGCLOUD_NACHRICHTEN_MANAGER))
 				.build();
 
 		@DisplayName("should return true if the command is CREATED_ATTACHED_ITEM order outgoing by mailserice")
 		@Test
 		void shouldReturnTrue() {
-			var result = handler.isOutgoingPostfachNachrichtByMailService(matchingCommand);
+			var result = handler.isOutgoingPostfachNachrichtByOzgCloudNachrichtenManager(matchingCommand);
 
 			assertThat(result).isTrue();
 		}
@@ -131,10 +131,10 @@ class HistorieCommandHandlerTest {
 		void shouldReturnFalseOnIncoming() {
 			var nonMatchingCommand = matchingCommand.toBuilder()
 					.body(Map.of("item", Map.of(HistorieCommandHandler.DIRECTION, HistorieCommandHandler.DIRECTION_INCOMMING),
-							HistorieCommandHandler.CLIENT, HistorieCommandHandler.MAIL_SERVICE))
+							HistorieCommandHandler.CLIENT, HistorieCommandHandler.OZGCLOUD_NACHRICHTEN_MANAGER))
 					.build();
 
-			var result = handler.isOutgoingPostfachNachrichtByMailService(nonMatchingCommand);
+			var result = handler.isOutgoingPostfachNachrichtByOzgCloudNachrichtenManager(nonMatchingCommand);
 
 			assertThat(result).isFalse();
 		}
@@ -146,7 +146,7 @@ class HistorieCommandHandlerTest {
 							HistorieCommandHandler.CLIENT, "Goofy"))
 					.build();
 
-			var result = handler.isOutgoingPostfachNachrichtByMailService(nonMatchingCommand);
+			var result = handler.isOutgoingPostfachNachrichtByOzgCloudNachrichtenManager(nonMatchingCommand);
 
 			assertThat(result).isFalse();
 		}
@@ -262,7 +262,7 @@ class HistorieCommandHandlerTest {
 		@CsvSource(value = { "RECEIVE_POSTFACH_NACHRICHT;IN" }, delimiter = ';')
 		void shouldTranslateToReveivedIncomminNachricht(String target, String direction) {
 			var command = handler.translateOrder(
-					createCommand("MailService", CommandOrder.CREATE_ATTACHED_ITEM, direction));
+					createCommand("OzgCloud_NachrichtenManager", CommandOrder.CREATE_ATTACHED_ITEM, direction));
 
 			assertThat(command.getOrder().name()).isEqualTo(target);
 		}