diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml
index 3942d6760b36fb2f68b4048ed7fc22a18e0f8c8c..c1084ee33bd694659129af4a90e59dc5d1b0c288 100644
--- a/alfa-client/apps/alfa-e2e/docker-compose.yml
+++ b/alfa-client/apps/alfa-e2e/docker-compose.yml
@@ -106,7 +106,7 @@ services:
       - OZGCLOUD_VORGANG_BESCHEID_0_FORM_ENGINE_NAME=FormSolutions
       - OZGCLOUD_VORGANG_BESCHEID_0_FORM_ID=KFAS_STAGE_KI_10_Haltverbot_LANDESHACKATHON
       - OZGCLOUD_FEATURE_COLLABORATION_ENABLED=true
-      - GRPC_CLIENT_ZUFI-MANAGER_ADDRESS=static://zufi-manager:9190
+      - GRPC_CLIENT_ZUFI-MANAGER_ADDRESS=static://zufi-manager-server:9190
       - GRPC_CLIENT_ZUFI-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
     ports:
       - 8080:8080
@@ -114,7 +114,7 @@ services:
     depends_on:
       - vorgang-manager
       - user-manager
-      - zufi-manager
+      - zufi-manager-server
 
   elastic:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.3.2
@@ -176,7 +176,7 @@ services:
       mongodb:
         condition: service_healthy
 
-  zufi-manager-server:
+  zufi-manager-pvog:
     image: docker.ozg-sh.de/zufi-manager:snapshot-latest
     platform: linux/amd64
     environment:
@@ -190,7 +190,7 @@ services:
       smocker-init:
         condition: service_completed_successfully
 
-  zufi-manager:
+  zufi-manager-server:
     image: docker.ozg-sh.de/zufi-server:snapshot-latest
     platform: linux/amd64
     environment:
@@ -202,7 +202,7 @@ services:
     depends_on:
       mongodb:
         condition: service_healthy
-      zufi-manager-server:
+      zufi-manager-pvog:
         condition: service_completed_successfully
 
   smocker:
diff --git a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh
index 80caaaceb21c9ddcfc540d83d431dc0df4d1aa15..cf5367b572152286e9a23fd893f336ba3edb8f8b 100755
--- a/alfa-client/apps/alfa-e2e/start-e2e-environment.sh
+++ b/alfa-client/apps/alfa-e2e/start-e2e-environment.sh
@@ -66,7 +66,7 @@ echo
 echo
 echo "Starting VorgangManager, Alfa-Server and Zufi Server and Job for normal operations."
 
-$DOCKER_COMPOSE_CMD up -d vorgang-manager alfa zufi-manager zufi-manager-server
+$DOCKER_COMPOSE_CMD up -d vorgang-manager alfa zufi-manager-pvog zufi-manager-server
 
 waitForServerStarted() {
 	($DOCKER_COMPOSE_CMD logs | awk 'BEGIN{RS="\0"} /Started AlfaServerApplication/ && /Started VorgangManagerServerApplication/ { exit 1 }')