diff --git a/src/main/java/de/ozgcloud/nachrichten/antragraum/BayernIdSamlConfiguration.java b/src/main/java/de/ozgcloud/nachrichten/antragraum/BayernIdSamlConfiguration.java
index 80beddc2faf98af6a1f893645fef2e7b1abe55c1..53c57fc76bbbda9c4bf426e573f5bd71a82f12a3 100644
--- a/src/main/java/de/ozgcloud/nachrichten/antragraum/BayernIdSamlConfiguration.java
+++ b/src/main/java/de/ozgcloud/nachrichten/antragraum/BayernIdSamlConfiguration.java
@@ -60,11 +60,12 @@ import org.opensaml.xmlsec.keyinfo.KeyInfoSupport;
 import org.opensaml.xmlsec.signature.support.SignatureTrustEngine;
 import org.opensaml.xmlsec.signature.support.impl.ExplicitKeySignatureTrustEngine;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.security.converter.RsaKeyConverters;
 import org.springframework.security.saml2.Saml2Exception;
 import org.springframework.security.saml2.core.Saml2X509Credential;
-import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
 import lombok.Getter;
@@ -74,7 +75,8 @@ import net.shibboleth.utilities.java.support.xml.BasicParserPool;
 import net.shibboleth.utilities.java.support.xml.ParserPool;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
-@Service
+@Configuration
+@ConditionalOnProperty(AntragraumProperties.PROPERTY_ANTRAGSRAUM_URL)
 public class BayernIdSamlConfiguration {
 	private XMLObjectProviderRegistry registry;
 	@Getter
diff --git a/src/main/resources/application-bayern.yaml b/src/main/resources/application-bayern.yaml
index 898a6a6d7a85c34656f5ba0a34611a10025f4962..765940c40972f684097389caf6331114bfbdf1e0 100644
--- a/src/main/resources/application-bayern.yaml
+++ b/src/main/resources/application-bayern.yaml
@@ -4,4 +4,12 @@ ozgcloud:
     entityId: https://antragsraum.ozgcloud.de/
     metadataUri: "classpath:/bayernid/metadata/bayernid-idp-infra.xml"
     decryptionPrivateKey: "classpath:/bayernid/bayernid-test-enc.key"
-    decryptionCertificate: "classpath:/bayernid/bayernid-test-enc.crt"
\ No newline at end of file
+    decryptionCertificate: "classpath:/bayernid/bayernid-test-enc.crt"
+  nachrichten-manager:
+    url: static://localhost:9091
+grpc:
+  client:
+    info-manager:
+      address: static://localhost:9091
+  server:
+    port: 9092
\ No newline at end of file