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: