diff --git a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-6ec6739e824c8e56d9633622.yaml b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-6ec6739e824c8e56d9633622.yaml
index b0c5ebf..75c317f 100644
--- a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-6ec6739e824c8e56d9633622.yaml
+++ b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/etc/nevis/k8s-nai-6ec6739e824c8e56d9633622.yaml
@@ -45,7 +45,7 @@ spec:
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-a86c4a11242893d52f733068378b2211ab644143"
+    tag: "r-aeb0c5d5d28e7422ed623f8522b3bcaa8da3eb45"
     dir: "DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai"
     credentials: "git-credentials"
   keystores:
diff --git a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/conf/esauth4.xml b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/conf/esauth4.xml
index 9931a99..5925ff3 100644
--- a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/conf/esauth4.xml
+++ b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/conf/esauth4.xml
@@ -56,8 +56,8 @@
         <Domain name="cossa_realm" default="false" inactiveInterval="7200" reauthInterval="0" resetAuthenticationCondition="${inargs:cancel}">
             <Entry method="authenticate" state="cossa_realm_New_Dispatcher_Step"/>
             <Entry method="authenticate" state="cossa_realm_New_Dispatcher_Step" selector="${request:currentResource:^http[s]?\u003A//[^/]+/token/.*$:true}"/>
-            <Entry method="logout" state="cossa_realm_AuthorizationServer1"/>
-            <Entry method="logout" state="cossa_realm_AuthorizationServer1" selector="${request:currentResource:^http[s]?\u003A//[^/]+/token/.*$:true}"/>
+            <Entry method="logout" state="cossa_realm_AuthorizationServer"/>
+            <Entry method="logout" state="cossa_realm_AuthorizationServer" selector="${request:currentResource:^http[s]?\u003A//[^/]+/token/.*$:true}"/>
             <Entry method="stepup" state="cossa_realm_Selector"/>
             <Entry method="stepup" state="cossa_realm_New_Dispatcher_Step" selector="${request:currentResource:^http[s]?\u003A//[^/]+/token/.*$:true}"/>
         </Domain>
@@ -131,7 +131,7 @@
             <!-- source: pattern://9d599416f43a2414f36426a2 -->
             <ResultCond name="idtoken" next="cossa_realm_TokenExchangeEndpoint"/>
             <!-- source: pattern://9d599416f43a2414f36426a2 -->
-            <ResultCond name="nomatch" next="cossa_realm_AuthorizationServer1"/>
+            <ResultCond name="nomatch" next="cossa_realm_AuthorizationServer"/>
             <!-- source: pattern://9d599416f43a2414f36426a2 -->
             <Response value="AUTH_ERROR">
                 <!-- source: pattern://9d599416f43a2414f36426a2 -->
@@ -157,7 +157,7 @@
             <!-- source: pattern://89578db79d2bc15d55e11141 -->
             <property name="nevismeta.location" value="https://hans.agov-d.azure.adnovum.net/nevismeta/rest/modules/oauthv2/setups/Setup_00000000000000000000000000000000/entities/"/>
         </AuthState>
-        <AuthState name="cossa_realm_AuthorizationServer1" class="ch.nevis.esauth.auth.states.oauth2.AuthorizationServer" final="false" resumeState="true">
+        <AuthState name="cossa_realm_AuthorizationServer" class="ch.nevis.esauth.auth.states.oauth2.AuthorizationServer" final="false" resumeState="true">
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
             <ResultCond name="authenticate:valid-authorization-request" next="cossa_realm_New_Test_Login"/>
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
@@ -183,7 +183,9 @@
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
             <property name="propagationScope" value="session"/>
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
-            <property name="dataSource" value="local"/>
+            <property name="dataSource" value="nevisMeta"/>
+            <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
+            <property name="nevismeta.location" value="https://hans.agov-d.azure.adnovum.net/nevismeta/rest/modules/oauthv2/setups/Setup_00000000000000000000000000000000/entities/"/>
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
             <property name="openid.support" value="true"/>
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
@@ -248,18 +250,6 @@
             <property name="scope.phone.implicitFlowPolicy" value="NO_CONSENT_REQUIRED"/>
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
             <property name="scope.phone.clientCredentialsFlowPolicy" value="true"/>
-            <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
-            <property name="client.test" value=""/>
-            <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
-            <property name="client.test.type" value="public"/>
-            <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
-            <property name="client.test.grantTypes" value="implicit"/>
-            <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
-            <property name="client.test.redirectUrl" value="https://oidcdebugger.com/debug"/>
-            <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
-            <property name="client.test.responseTypes" value="token id_token"/>
-            <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
-            <property name="client.test.scope" value="openid offline_access"/>
         </AuthState>
         <AuthState name="cossa_realm_auth_failed" class="ch.nevis.esauth.auth.states.standard.AuthError" final="false">
             <!-- source: pattern://72e29eb80a951e518ce123e4 -->