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 930995c..98dc8ae 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-91c3b727c7e81bf48572ee10c926e33a8d9d7784"
+    tag: "r-ad49f4562324ae9db7d8d4af3d37505f4292a3a0"
     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 677ebd3..596321c 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
@@ -151,10 +151,7 @@
                 <!-- source: pattern://89578db79d2bc15d55e11141 -->
                 <Gui name="Default"/>
             </Response>
-            <!-- source: pattern://89578db79d2bc15d55e11141 -->
-            <property name="dataSource" value="nevismeta"/>
-            <!-- source: pattern://89578db79d2bc15d55e11141 -->
-            <property name="nevismeta.location" value="https://hans.agov-d.azure.adnovum.net/nevismeta/rest/modules/oauthv2/setups/Setup_00000000000000000000000000000000/entities/"/>
+            <propertyRef name="cossa_realm_AuthorizationServer"/>
         </AuthState>
         <AuthState name="cossa_realm_auth_failed" class="ch.nevis.esauth.auth.states.standard.AuthError" final="false">
             <!-- source: pattern://72e29eb80a951e518ce123e4 -->
@@ -198,27 +195,6 @@
             <!-- source: pattern://b6cbd53b8eee023b6d65f62d -->
             <property name="inargs:refresh_token" value="${inargs:subject_token}"/>
         </AuthState>
-        <AuthState name="cossa_realm_CallPolicyVerificationAPI" class="ch.adnovum.cossa.CallPolicyVerificationAPI" final="false" resumeState="false">
-            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-            <ResultCond name="multiple_profiles" next="cossa_realm_Authentication_Failed"/>
-            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-            <ResultCond name="no_valid_profile" next="cossa_realm_Authentication_Failed"/>
-            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-            <ResultCond name="ok" next="cossa_realm_Prepare_Done"/>
-            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-            <Response value="AUTH_CONTINUE">
-                <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-                <Gui name="Default"/>
-            </Response>
-            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-            <property name="evaluatePoliciesForAllProfiles" value="false"/>
-            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-            <property name="klpURL" value="https://klp.agov-w.azure.adnovum.net/api/endpoint"/>
-            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-            <property name="basicAuthUsername" value="testbasicauth"/>
-            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-            <property name="basicAuthPassword" value="testtesttest"/>
-        </AuthState>
         <AuthState name="cossa_realm_AuthorizationServer" class="ch.adnovum.cossa.TokenExchangeEndpointRefresh" final="false" resumeState="true">
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
             <ResultCond name="authenticate:valid-authorization-request" next="cossa_realm_New_Test_Login"/>
@@ -313,28 +289,26 @@
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
             <property name="scope.phone.clientCredentialsFlowPolicy" value="true"/>
         </AuthState>
-        <AuthState name="cossa_realm_Authentication_Failed" class="ch.nevis.esauth.auth.states.standard.AuthError" final="false">
+        <AuthState name="cossa_realm_CallPolicyVerificationAPI" class="ch.adnovum.cossa.CallPolicyVerificationAPI" final="false" resumeState="false">
             <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-            <Response value="AUTH_ERROR">
+            <ResultCond name="multiple_profiles" next="cossa_realm_Authentication_Failed"/>
+            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+            <ResultCond name="no_valid_profile" next="cossa_realm_Authentication_Failed"/>
+            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+            <ResultCond name="ok" next="cossa_realm_Prepare_Done"/>
+            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+            <Response value="AUTH_CONTINUE">
                 <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-                <Gui name="Error">
-                    <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-                    <GuiElem name="info" type="error" label="error_99"/>
-                    <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
-                    <GuiElem name="submit" type="button" label="continue.button.label"/>
-                </Gui>
+                <Gui name="Default"/>
             </Response>
-        </AuthState>
-        <AuthState name="cossa_realm_Prepare_Done" class="ch.nevis.esauth.auth.states.scripting.ScriptState" final="false">
-            <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
-            <ResultCond name="default" next="cossa_realm_Auth_Done"/>
-            <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
-            <Response value="AUTH_DONE">
-                <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
-                <Gui name="ContinueResponse"/>
-            </Response>
-            <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
-            <property name="script" value="file:///var/opt/nevisauth/default/conf/prepare_done.groovy"/>
+            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+            <property name="evaluatePoliciesForAllProfiles" value="false"/>
+            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+            <property name="klpURL" value="https://klp.agov-w.azure.adnovum.net/api/endpoint"/>
+            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+            <property name="basicAuthUsername" value="testbasicauth"/>
+            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+            <property name="basicAuthPassword" value="testtesttest"/>
         </AuthState>
         <AuthState name="cossa_realm_New_Test_Login" class="ch.nevis.esauth.auth.states.scripting.ScriptState" final="false">
             <!-- source: pattern://635e4d617af6818edc9ae7c9 -->
@@ -376,6 +350,29 @@
             <!-- source: pattern://a1e5d0192e082e689465a0c9 -->
             <property name="keyobjectref" value="tokensigner"/>
         </AuthState>
+        <AuthState name="cossa_realm_Authentication_Failed" class="ch.nevis.esauth.auth.states.standard.AuthError" final="false">
+            <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+            <Response value="AUTH_ERROR">
+                <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+                <Gui name="Error">
+                    <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+                    <GuiElem name="info" type="error" label="error_99"/>
+                    <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
+                    <GuiElem name="submit" type="button" label="continue.button.label"/>
+                </Gui>
+            </Response>
+        </AuthState>
+        <AuthState name="cossa_realm_Prepare_Done" class="ch.nevis.esauth.auth.states.scripting.ScriptState" final="false">
+            <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
+            <ResultCond name="default" next="cossa_realm_Auth_Done"/>
+            <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
+            <Response value="AUTH_DONE">
+                <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
+                <Gui name="ContinueResponse"/>
+            </Response>
+            <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
+            <property name="script" value="file:///var/opt/nevisauth/default/conf/prepare_done.groovy"/>
+        </AuthState>
         <AuthState name="cossa_realm_Auth_Done" class="ch.nevis.esauth.auth.states.standard.AuthDone" final="false">
             <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
             <Response value="AUTH_DONE">