diff --git a/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Decrypter.java b/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Decrypter.java
index 41575e12f278e08dc763488fd80d0048e0c7d29c..19bec49fd72dbc69f92e9922637fffccdfe442ba 100644
--- a/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Decrypter.java
+++ b/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Decrypter.java
@@ -40,6 +40,7 @@ import org.opensaml.xmlsec.encryption.support.InlineEncryptedKeyResolver;
 import org.opensaml.xmlsec.encryption.support.SimpleRetrievalMethodEncryptedKeyResolver;
 import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
 import org.opensaml.xmlsec.keyinfo.impl.CollectionKeyInfoCredentialResolver;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.security.saml2.Saml2Exception;
 import org.springframework.stereotype.Service;
 
@@ -47,6 +48,7 @@ import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
+@ConditionalOnProperty(AntragraumProperties.PROPERTY_ANTRAGSRAUM_URL)
 class Saml2Decrypter {
 	private final BayernIdSamlConfiguration configuration;
 
diff --git a/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Parser.java b/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Parser.java
index e134f7e2ed1c24fd71f4309aa91175b735bccc68..bb27b734e7289973be5ae92fb9a4e078032213b6 100644
--- a/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Parser.java
+++ b/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Parser.java
@@ -30,6 +30,7 @@ import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.saml.saml2.core.Response;
 import org.opensaml.saml.saml2.core.impl.ResponseUnmarshaller;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.security.saml2.Saml2Exception;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +38,7 @@ import lombok.RequiredArgsConstructor;
 import net.shibboleth.utilities.java.support.xml.XMLParserException;
 
 @Service
+@ConditionalOnProperty(AntragraumProperties.PROPERTY_ANTRAGSRAUM_URL)
 @RequiredArgsConstructor
 class Saml2Parser {
 	private final BayernIdSamlConfiguration configuration;
diff --git a/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Verifier.java b/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Verifier.java
index 029f6a015c9cb3312588af52fcecad88881339e1..d63a39789442f9cf9e1c6afbb9460d4a3fed6429 100644
--- a/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Verifier.java
+++ b/src/main/java/de/ozgcloud/nachrichten/antragraum/Saml2Verifier.java
@@ -28,6 +28,7 @@ import jakarta.annotation.PostConstruct;
 
 import org.opensaml.saml.security.impl.SAMLSignatureProfileValidator;
 import org.opensaml.xmlsec.signature.support.SignatureTrustEngine;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.security.saml2.core.Saml2Error;
 import org.springframework.security.saml2.core.Saml2ErrorCodes;
 import org.springframework.stereotype.Service;
@@ -39,6 +40,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 @Log4j2
 @RequiredArgsConstructor
 @Service
+@ConditionalOnProperty(AntragraumProperties.PROPERTY_ANTRAGSRAUM_URL)
 class Saml2Verifier {
 	public static final String INVALID_SIGNATURE = "Invalid signature for object [%s]: ";
 	public static final String SIGNATURE_MISSING = "Signature missing";
diff --git a/src/main/resources/application-bayern.yaml b/src/main/resources/application-bayern.yaml
index 765940c40972f684097389caf6331114bfbdf1e0..898a6a6d7a85c34656f5ba0a34611a10025f4962 100644
--- a/src/main/resources/application-bayern.yaml
+++ b/src/main/resources/application-bayern.yaml
@@ -4,12 +4,4 @@ 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"
-  nachrichten-manager:
-    url: static://localhost:9091
-grpc:
-  client:
-    info-manager:
-      address: static://localhost:9091
-  server:
-    port: 9092
\ No newline at end of file
+    decryptionCertificate: "classpath:/bayernid/bayernid-test-enc.crt"
\ No newline at end of file
diff --git a/src/test/resources/application-bayern.yaml b/src/test/resources/application-bayern.yaml
index d6e6ed1803fc7fdec7abe6aa89443b720d36005f..765940c40972f684097389caf6331114bfbdf1e0 100644
--- a/src/test/resources/application-bayern.yaml
+++ b/src/test/resources/application-bayern.yaml
@@ -1,9 +1,15 @@
 ozgcloud:
   antragraum:
-    url: "https://antragsraum.de"
-    bayernid:
-      saml:
-        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
+    url: https://dev.antragsraum.de/
+    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"
+  nachrichten-manager:
+    url: static://localhost:9091
+grpc:
+  client:
+    info-manager:
+      address: static://localhost:9091
+  server:
+    port: 9092
\ No newline at end of file