diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index 60806cdb7ee2b0ff1eb5ebef98ad1b3d489e191b..cb9ff09ba278f1c9a324a7930772d0920f81e4a0 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -70,7 +70,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.ozgcloud_vorgangmanager_address" -}}
-{{ printf "dns://%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }}
+{{ printf "%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }}
 {{- end -}}
 
 {{- define "app.databaseSecretName" -}}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index f0f889b7e45488f63f953ba582272a8cd35cbd13..8c05eea1cad70da0c771ab05a737165a1406cfd1 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -215,11 +215,13 @@ spec:
           - name: ozgcloud_antragraum_url
             value: {{ quote (required "ozgcloud.antragraum.url must be set if ozgcloud.antragraum is enabled" ((.Values.ozgcloud).antragraum).url) }}
           - name: ozgcloud_antragraum_metadataUri
-            value: {{ quote (required "ozgcloud.antragraum.metadataUri must be set if ozgcloud.antragraum is enabled" ((.Values.ozgcloud).antragraum).metadataUri) }}
+            value: "file:/keystore/bayernid/metadata.xml"
           - name: ozgcloud_antragraum_decryptionPrivateKey
             value: "file:/keystore/bayernid/bayern-id.key"
           - name: ozgcloud_antragraum_decryptionCertificate
             value: "file:/keystore/bayernid/bayern-id.crt"
+          - name: ozgcloud_antragraum_entityId
+            value: {{ quote (required "ozgcloud.antragraum.entityId must be set if ozgcloud.antragraum is enabled" ((.Values.ozgcloud).antragraum).entityId) }}
           {{- end }}
           {{- if (((.Values.ozgcloud).feature).bescheid).enableDummyDocumentProcessor }}
           - name: ozgcloud_feature_bescheid_enableDummyDocumentProcessor
diff --git a/src/test/helm/deployment_antragraum_test.yaml b/src/test/helm/deployment_antragraum_test.yaml
index 7905ec79487182bc1e11c667a1a85528bad162af..0def5958d58429a5889774f8dc0c3cd49daff8cd 100644
--- a/src/test/helm/deployment_antragraum_test.yaml
+++ b/src/test/helm/deployment_antragraum_test.yaml
@@ -33,13 +33,13 @@ set:
   ozgcloud:
     environment: dev
 tests:
-  - it: should set antragraum values
+  - it: should set antragsraum values
     set:
       ozgcloud:
         antragraum:
           enabled: true
           url: https://antragraum.address
-          metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml"
+          entityId: https://sso.dev.de/realms/by-antragsraum-idp
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -55,7 +55,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_antragraum_metadataUri
-            value: "classpath:/bayernid/metadata/bayernid-idp-infra.xml"
+            value: "file:/keystore/bayernid/metadata.xml"
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -82,12 +82,12 @@ tests:
       ozgcloud:
         antragraum:
           enabled: true
-          metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml"
+          entityId: https://sso.dev.de/realms/by-antragsraum-idp
     asserts:
       - failedTemplate:
           errorMessage: "ozgcloud.antragraum.url must be set if ozgcloud.antragraum is enabled"
 
-  - it: should fail if metadataUri is not set
+  - it: should fail if entityId is not set
     set:
       ozgcloud:
         antragraum:
@@ -95,7 +95,7 @@ tests:
           url: https://antragraum.address
     asserts:
       - failedTemplate:
-          errorMessage: "ozgcloud.antragraum.metadataUri must be set if ozgcloud.antragraum is enabled"
+          errorMessage: "ozgcloud.antragraum.entityId must be set if ozgcloud.antragraum is enabled"
 
 
   - it: should set volumeMounts
@@ -104,7 +104,7 @@ tests:
         antragraum:
           enabled: true
           url: https://antragraum.address
-          metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml"
+          entityId: https://sso.dev.de/realms/by-antragsraum-idp
     asserts:
       - contains:
           path: spec.template.spec.containers[0].volumeMounts
@@ -129,7 +129,7 @@ tests:
         antragraum:
           enabled: true
           url: https://antragraum.address
-          metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml"
+          entityId: https://sso.dev.de/realms/by-antragsraum-idp
     asserts:
       - contains:
           path: spec.template.spec.volumes
diff --git a/src/test/helm/deployment_nachrichten_manager_address_test.yaml b/src/test/helm/deployment_nachrichten_manager_address_test.yaml
index c473b5dd34e7e75f4132b0ae359f9eb47a042f44..b91b3cc5fe1d814a525fc99464add26e746aa617 100644
--- a/src/test/helm/deployment_nachrichten_manager_address_test.yaml
+++ b/src/test/helm/deployment_nachrichten_manager_address_test.yaml
@@ -39,4 +39,4 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_nachrichten-manager_address
-            value:  dns://vorgang-manager.sh-helm-test:9090
+            value:  vorgang-manager.sh-helm-test:9090
diff --git a/vorgang-manager-server/src/main/resources/application.yml b/vorgang-manager-server/src/main/resources/application.yml
index 27c32295fea74eaca2e91f8ef769892658932e9b..6784f1d84c27c3a9745a4eb3f978d175cb440eeb 100644
--- a/vorgang-manager-server/src/main/resources/application.yml
+++ b/vorgang-manager-server/src/main/resources/application.yml
@@ -96,7 +96,4 @@ ozgcloud:
   user-manager:
     address: ${grpc.client.user-manager.address:false}
     negotiation-type: ${grpc.client.user-manager.negotiationType}
-  antragraum:
-    entityId: https://antragsraum.ozgcloud.de/
-    metadataUri: "classpath:/bayernid/bayernid-idp-infra.xml"