diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml
index 07a146b..8221b22 100644
--- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml
+++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/etc/nevis/k8s-nevisauth-7022472ae407577ae604bbb8.yaml
@@ -45,7 +45,7 @@ spec:
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-12631865cbb9170941d0aac3a10d80fa4222f815"
+    tag: "r-ac8d94ac48915f4fa5085ebb6c94d28d6d7f984a"
     dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth"
     credentials: "git-credentials"
   keystores:
diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml
index 816ed0e..e0401d9 100644
--- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml
+++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth/var/opt/nevisauth/default/conf/esauth4.xml
@@ -516,6 +516,8 @@
             <!-- source: pattern://1d81bd987455a8e1ee044ccf -->
             <property name="out.authnContextClassRef" value="${sess:contextClassRefToSet}"/>
             <!-- source: pattern://1d81bd987455a8e1ee044ccf -->
+            <property name="out.audienceRestriction" value="https://trustbroker-idp.agov-w.azure.adnovum.net"/>
+            <!-- source: pattern://1d81bd987455a8e1ee044ccf -->
             <property name="out.attribute.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" value="${sess:ch.nevis.idm.User.firstName}"/>
             <!-- source: pattern://1d81bd987455a8e1ee044ccf -->
             <property name="out.attribute.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" value="${sess:ch.nevis.idm.User.lastName}"/>
@@ -523,8 +525,6 @@
             <property name="out.attribute.http://schemas.agov.ch/ws/2023/05/identity/claims/sex" value="${sess:ch.nevis.idm.User.gender}"/>
             <!-- source: pattern://1d81bd987455a8e1ee044ccf -->
             <property name="out.attribute.http://schemas.agov.ch/ws/2023/05/identity/claims/dateOfBirth" value="${sess:ch.nevis.idm.User.birthDate:^(\d\d\d\d-\d\d-\d\d).*$}"/>
-            <!-- source: pattern://1d81bd987455a8e1ee044ccf -->
-            <property name="out.audienceRestriction" value="https://trustbroker-idp.agov-epr-lab.azure.adnovum.net"/>
         </AuthState>
         <AuthState name="Auth_Realm_Main_IDP_Auth_Realm_Main_IDP_Custom_EPD_Artifact_IDP" class="ch.nevis.esauth.auth.states.saml.IdentityProviderState" final="false" resumeState="true">
             <!-- source: pattern://5a75ffc73b91b88cfab6168e -->
@@ -604,7 +604,7 @@
             <!-- source: pattern://5a75ffc73b91b88cfab6168e -->
             <property name="out.authnContextClassRef" value="${sess:contextClassRefToSet}"/>
             <!-- source: pattern://5a75ffc73b91b88cfab6168e -->
-            <property name="out.audienceRestriction" value="https://trustbroker-idp.agov-epr-lab.azure.adnovum.net"/>
+            <property name="out.audienceRestriction" value="https://trustbroker-idp.agov-w.azure.adnovum.net"/>
             <!-- source: pattern://5a75ffc73b91b88cfab6168e -->
             <property name="out.attribute.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" value="${sess:ch.nevis.idm.User.firstName}"/>
             <!-- source: pattern://5a75ffc73b91b88cfab6168e -->
@@ -690,6 +690,8 @@
             <!-- source: pattern://92cb6d5256008a32f12ceb93 -->
             <property name="out.authnContextClassRef" value="${sess:contextClassRefToSet}"/>
             <!-- source: pattern://92cb6d5256008a32f12ceb93 -->
+            <property name="out.audienceRestriction" value="https://trustbroker.agov-d.azure.adnovum.net"/>
+            <!-- source: pattern://92cb6d5256008a32f12ceb93 -->
             <property name="out.attribute.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" value="${sess:ch.nevis.idm.User.email}"/>
             <!-- source: pattern://92cb6d5256008a32f12ceb93 -->
             <property name="out.attribute.http://schemas.agov.ch/ws/2023/05/identity/claims/languageOfCorrespondance" value="${sess:ch.nevis.idm.User.language}"/>
@@ -733,8 +735,6 @@
             <property name="out.attribute.http://schemas.agov.ch/ws/2024/02/identity/claims/address/qa/verificationMethod" value="#{ (sess['agov.appAddressRequired'] == 'true') ? ''.concat(sess.get('agov.adressVerification')).replace('Location', 'Domicile') : '' }"/>
             <!-- source: pattern://92cb6d5256008a32f12ceb93 -->
             <property name="out.attribute.http://schemas.agov.ch/ws/2024/02/identity/claims/address/countryName" value="#{ (sess['agov.appAddressRequired'] == 'true') ? sess['agov.countryName'] : ''}"/>
-            <!-- source: pattern://92cb6d5256008a32f12ceb93 -->
-            <property name="out.audienceRestriction" value="https://trustbroker.agov-epr-lab.azure.adnovum.net"/>
         </AuthState>
         <AuthState name="Auth_Realm_Main_IDP_ReturnTimeoutButKeepSession" class="ch.nevis.esauth.auth.states.scripting.ScriptState" final="false" resumeState="true">
             <!-- source: pattern://826166d230a6a4849f2837ae -->