diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml
index 031cfac2dfc9efe5f2fc146c3ebf9f579bf4117a..5bfa1deb80297c4a9e4c905b5818c64e65777e85 100644
--- a/alfa-client/apps/alfa-e2e/docker-compose.yml
+++ b/alfa-client/apps/alfa-e2e/docker-compose.yml
@@ -36,19 +36,19 @@ services:
     image: docker.ozg-sh.de/vorgang-manager:${VORGANG_MANAGER_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
-      - SPRING_DATA_MONGODB_HOST=mongodb
-      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-dev,e2e}
+      - GRPC_CLIENT_USER_MANAGER_ADDRESS=static://user-manager:9000
+      - GRPC_CLIENT_USER_MANAGER_NEGOTIATION_TYPE=PLAINTEXT
       - logging_level_org_springframework_security=${LOGGING_LEVEL:-WARN}
       - OZGCLOUD_ELASTICSEARCH_ADDRESS=elastic:9200
-      - OZGCLOUD_ELASTICSEARCH_USERNAME=elastic
-      - OZGCLOUD_ELASTICSEARCH_PASSWORD=password
       - OZGCLOUD_ELASTICSEARCH_INDEX=e2e-test-index
+      - OZGCLOUD_ELASTICSEARCH_PASSWORD=password
+      - OZGCLOUD_ELASTICSEARCH_USERNAME=elastic
       - OZGCLOUD_ELASTICSEARCH_USESSL=false
-      - 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
       - OZGCLOUD_PROCESSORS_0_NAME=ticketCheck
+      - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
+      - SPRING_DATA_MONGODB_HOST=mongodb
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-dev,e2e}
     ports:
       - 9091:9090
     depends_on:
@@ -61,22 +61,22 @@ services:
     image: docker.ozg-sh.de/alfa:${ALFA_DOCKER_IMAGE:-snapshot-latest}
     platform: linux/amd64
     environment:
-      - 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
+      - GRPC_CLIENT_PLUTO_ADDRESS=static://vorgang-manager:9090 # TODO: Entfernen sobald GRPC_CLIENT_VORGANG-MANAGER_ADDRESS existiert
+      - GRPC_CLIENT_USER-MANAGER_ADDRESS=static://user-manager:9000
+      - GRPC_CLIENT_USER-MANAGER_NEGOTIATION_TYPE=PLAINTEXT
+      - GRPC_CLIENT_VORGANG-MANAGER_ADDRESS=static://vorgang-manager:9090
+      - KEYCLOAK_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de
       - KEYCLOAK_REALM=${KEYCLOAK_REALM:-by-e2e-local-dev}
       - KEYCLOAK_RESOURCE=${KEYCLOAK_CLIENT:-alfa}
-      - KEYCLOAK_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de
-      - OZGCLOUD_USER-ASSISTANCE_DOCUMENTATION_URL=/assets/benutzerleitfaden/Benutzerleitfaden_2.5.pdf
       - OZGCLOUD_FEATURE_VORGANG_EXPORT=true
-      - OZGCLOUD_VORGANG_PROCESSOR_0_FORM_ID=Erstattung_ERFOLG
+      - OZGCLOUD_USER-ASSISTANCE_DOCUMENTATION_URL=/assets/benutzerleitfaden/Benutzerleitfaden_2.5.pdf
+      - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
       - OZGCLOUD_VORGANG_PROCESSOR_0_FORM_ENGINE_NAME=AFM
-      - OZGCLOUD_VORGANG_PROCESSOR_1_FORM_ID=Erstattung_FAIL
+      - OZGCLOUD_VORGANG_PROCESSOR_0_FORM_ID=Erstattung_ERFOLG
       - OZGCLOUD_VORGANG_PROCESSOR_1_FORM_ENGINE_NAME=AFM
+      - OZGCLOUD_VORGANG_PROCESSOR_1_FORM_ID=Erstattung_FAIL
       - OZGCLOUD_VORGANG_PROCESSOR_NAMES_0=ticketCheck
-
+      - SPRING_PROFILES_ACTIVE=remotekc, e2e
     ports:
       - 8080:8080
     depends_on:
@@ -89,10 +89,10 @@ services:
       - 9200:9200
       - 9300:9300
     environment:
+      - discovery.type=single-node
       - ELASTIC_PASSWORD=password
-      - MEM_LIMIT=1073741824
       - ES_JAVA_OPTS=-Xms1g -Xmx1g
-      - discovery.type=single-node
+      - MEM_LIMIT=1073741824
       - xpack.security.enabled=false
       - xpack.security.http.ssl.enabled=false
     ulimits:
@@ -112,23 +112,24 @@ services:
     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
-      - QUARKUS_OIDC_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de/realms/${KEYCLOAK_REALM:-by-e2e-local-dev}
-      - QUARKUS_LOG_CONSOLE_JSON=false
-      - QUARKUS_OIDC_CLIENT_ID=alfa
-      - OZGCLOUD_KEYCLOAK_API_USER=usermanagerapiuser
+      - KEYCLOAK_URL=https://sso.dev.by.ozg-cloud.de
+      - OZGCLOUD_KEYCLOAK_API_CLIENT=alfa
       - OZGCLOUD_KEYCLOAK_API_PASSWORD= 
       - OZGCLOUD_KEYCLOAK_API_REALM=${KEYCLOAK_REALM:-by-e2e-local-dev}
-      - OZGCLOUD_KEYCLOAK_API_CLIENT=alfa
+      - OZGCLOUD_KEYCLOAK_API_USER=usermanagerapiuser
       - 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
+      - OZGCLOUD_USER-MANAGER_URL=http://localhost:9092
+      - OZGCLOUD_USERSYNC_PERIOD=disabled
+      - QUARKUS_GRPC_SERVER_SSL_CERTIFICATE=
+      - QUARKUS_GRPC_SERVER_SSL_KEY=
+      - QUARKUS_HTTP_CORS_ORIGINS=http://localhost:4300,http://127.0.0.1:4300,https://e2e.dev.by.ozg-cloud.de
+      - QUARKUS_LOG_CONSOLE_JSON=false
       - QUARKUS_MONGODB_CONNECTION_STRING=mongodb://mongodb:27017
       - QUARKUS_MONGODB_DATABASE=usermanager
+      - QUARKUS_OIDC_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de/realms/${KEYCLOAK_REALM:-by-e2e-local-dev}
+      - QUARKUS_OIDC_CLIENT_ID=alfa
       - quarkus.log.category."io.quarkus.oidc.runtime.OidcProvider".level=TRACE
       - quarkus.log.category."io.quarkus.oidc.runtime.OidcProvider".min-level=TRACE
-      - QUARKUS_GRPC_SERVER_SSL_CERTIFICATE=
-      - QUARKUS_GRPC_SERVER_SSL_KEY=
     ports:
       - 9092:8080
     depends_on:
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
index f89d4e21f82e8656ff63d6f4c594dfd28cec2d37..0b19323ad2ec9617b0a67ac6e874722b9d214272 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
@@ -21,7 +21,7 @@ alfa:
     className: openshift-default
   baseUrl: dev.by.ozg-cloud.de
 
-pluto:
+vorgang_manager:
   env:
     overrideSpringProfiles: "oc,e2e,dev"
   elasticsearch:
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
index 4bb08d8692675304ae1557eafe14a1909ef9733b..7a266bc77e76695342c2ea3d166345f2caf25d29 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
@@ -17,7 +17,7 @@ alfa:
     className: openshift-default
   baseUrl: dev.by.ozg-cloud.de
 
-pluto:
+vorgang_manager:
   env:
     overrideSpringProfiles: "oc,e2e,dev"
   elasticsearch:
diff --git a/alfa-client/apps/alfa-e2e/stop-e2e-environment.sh b/alfa-client/apps/alfa-e2e/stop-e2e-environment.sh
index eb07e80c0ac7e05867707d675520f10b2254d657..49ebbc64db81ca6672e21ff9398808391bfd9d14 100755
--- a/alfa-client/apps/alfa-e2e/stop-e2e-environment.sh
+++ b/alfa-client/apps/alfa-e2e/stop-e2e-environment.sh
@@ -29,4 +29,4 @@ SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
 echo "Using docker compose -f ${SCRIPT_DIR}/docker-compose.yml ..."
 echo
 
-docker compose -f ${SCRIPT_DIR}/docker-compose.yml down --volumes
+docker compose -f ${SCRIPT_DIR}/docker-compose.yml down --volumes --remove-orphans
diff --git a/src/main/helm/questions.yml b/src/main/helm/questions.yml
index 60159a956b42a75825164b2c24e70b0f663df030..253a9c80f58edc2b3acb4b712f3264119a00a1c2 100644
--- a/src/main/helm/questions.yml
+++ b/src/main/helm/questions.yml
@@ -52,11 +52,11 @@ questions:
     label: "Environment"
     type: string
     required: true
-  - variable: plutoName
+  - variable: vorgangManagerName
     group: "Other"
     type: string
-    default: "pluto"
-    label: "Name of the pluto deployment in the namespace"
+    default: "vorgang-manager"
+    label: "Name of the vorgang-manager deployment in the namespace"
   - variable: sso.role_einheitlicher_ansprechpartner
     group: "Other"
     type: boolean
diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 1eabdba9907ff2565195931b804ae2873f45248d..59f494e51d8a6842fc5eab58c56c4c179ad03a01 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -50,8 +50,8 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 {{- end -}}
 
-{{- define "app.grpc_client_pluto_address" -}}
-{{ printf "%s.%s:9090" ( coalesce .Values.plutoName "pluto" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- define "app.grpc_client_vorgang_manager_address" -}}
+{{ printf "%s.%s:9090" ( coalesce .Values.vorgangManagerName "vorgang-manager" ) .Release.Namespace | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end -}}
 
 {{- define "app.grpc_client_user-manager_address" -}}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 003bfc9a9616eaffb78f8ad2acd41e65b43e99ed..6d2ee1247d7174d5780dd01cd05010f214d478fc 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -68,7 +68,7 @@ spec:
         - name: SERVICE_BINDING_ROOT
           value: "/bindings"
         - name: grpc_client_pluto_address
-          value: {{ include "app.grpc_client_pluto_address" . }}
+          value: {{ include "app.grpc_client_vorgang_manager_address" . }}
         - name: grpc_client_user-manager_address
           value: {{ include "app.grpc_client_user-manager_address" . }}
         - name: spring_profiles_active
diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml
index 59e83c22a9cfea4aa649be131318a0ea87c38ad1..21f80e8acc7c074ee9c05665f63c945736af0f1b 100644
--- a/src/main/helm/templates/network_policy.yaml
+++ b/src/main/helm/templates/network_policy.yaml
@@ -22,7 +22,7 @@ spec:
   - to:
     - podSelector: 
         matchLabels:
-          component: pluto
+          component: vorgang-manager
     ports:
       - port: 9090
         protocol: TCP
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index f9191eeb7ced341e8dce26d0e91c2903dbcd2ac2..6299afcb8429b324f98f373af6e57512af60a27d 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -60,7 +60,7 @@ usermanagerName: user-manager
 #     cpu: 50m
 #     memory: 500Mi
 
-# plutoName: pluto # [default: pluto]
+# vorgangManagerName: vorgang-manager # [default: vorgang-manager]
 # sso: # Most values are set according to namespace name (<bundesland>-<name>-<level>) and are optional
   # serverUrl: https://sso.<level>.by.ozg-cloud.de # [default: https://sso.dev.by.ozg-cloud.de, if level == "stage|prod" https://sso.by.ozg-cloud.de]
   # apiPassword:   # Required value
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index f0dee202346c76fd2d05240b1db0f05ae425850f..9d695aaf286b08f7e3b54ee4f0f57a2a2cbf9202 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -39,7 +39,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_pluto_address
-            value: pluto.sh-helm-test:9090
+            value: vorgang-manager.sh-helm-test:9090
       - contains:
           path: spec.template.spec.containers[0].env
           content:
diff --git a/src/test/helm/deployment_pluto_address_test.yaml b/src/test/helm/deployment_pluto_address_test.yaml
index ed81b0fc6284bbdbc03f61f38a2893277e314537..36dc726c76681f2e1251bac72e52cf01fee9d779 100644
--- a/src/test/helm/deployment_pluto_address_test.yaml
+++ b/src/test/helm/deployment_pluto_address_test.yaml
@@ -29,12 +29,12 @@ release:
 templates:
   - templates/deployment.yaml
 tests:
-  - it: should set the pluto name
+  - it: should set the vorgang-manager name
     set:
-      plutoName: my-test-pluto-name
+      vorgangManagerName: my-test-vorgang-manager-name
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_pluto_address
-            value: my-test-pluto-name.sh-helm-test:9090
+            value: my-test-vorgang-manager-name.sh-helm-test:9090
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index 1f1d32e794926142865db4ffab1ea1813e35fe75..bd129d8b2f5e8a7876d841446a75df612ea46944 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -62,7 +62,7 @@ tests:
             - to:
               - podSelector: 
                   matchLabels:
-                    component: pluto
+                    component: vorgang-manager
               ports:
                 - port: 9090
                   protocol: TCP
diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml
index 53cb775ef7ca1e4654128e8facd45cf70c36b2e6..e6c704ec6a1d2b82457a0aaec36c904568a248be 100644
--- a/src/test/unit-values.yaml
+++ b/src/test/unit-values.yaml
@@ -25,7 +25,7 @@
 cluster_env: ""
 
 replicaCount: 5
-plutoName: pluto
+vorgangManagerName: vorgang-manager
 usermanagerName: my-test-usermanager-name
 
 ozgcloud: