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 0d32842..91574e3 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-1f03bddd0f92fbe9f4d5860646279a8be7b3d964"
+    tag: "r-99f9159d2d645d91d0a897ce18fb565381fd67a4"
     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 6a21675..b553cf0 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
@@ -171,7 +171,7 @@
             <!-- source: pattern://a976546c6a56dc04c0d34592 -->
             <ResultCond name="invalid_grant" next="cossa_realm_auth_failed"/>
             <!-- source: pattern://a976546c6a56dc04c0d34592 -->
-            <ResultCond name="ok" next="cossa_realm_New_Transform_Variables_Step"/>
+            <ResultCond name="ok" next="cossa_realm_klpscope"/>
             <!-- source: pattern://a976546c6a56dc04c0d34592 -->
             <Response value="AUTH_CONTINUE">
                 <!-- source: pattern://a976546c6a56dc04c0d34592 -->
@@ -289,18 +289,15 @@
             <!-- source: pattern://e02a36447ce2d3c66d8d81c0 -->
             <property name="scope.phone.clientCredentialsFlowPolicy" value="true"/>
         </AuthState>
-        <AuthState name="cossa_realm_New_Transform_Variables_Step" class="ch.nevis.esauth.auth.states.standard.TransformAttributes" final="false">
-            <!-- source: pattern://f1c445634ed60460be12043e -->
-            <ResultCond name="ok" next="cossa_realm_klpscope"/>
-            <!-- source: pattern://f1c445634ed60460be12043e -->
-            <Response value="AUTH_ERROR">
-                <!-- source: pattern://f1c445634ed60460be12043e -->
-                <Arg name="ch.nevis.isiweb4.response.status" value="403"/>
-            </Response>
-            <!-- source: pattern://f1c445634ed60460be12043e -->
-            <property name="notes:scope" value="notesscope"/>
-            <!-- source: pattern://f1c445634ed60460be12043e -->
-            <property name="sess:scope" value="testklp"/>
+        <AuthState name="cossa_realm_klpscope" class="ch.adnovum.cossa.KLPScopeToProfileBinding" final="false" resumeState="true">
+            <!-- source: pattern://9c293034211ea47bd3e9c12b -->
+            <ResultCond name="default" next="cossa_realm_CallPolicyVerificationAPI"/>
+            <!-- source: pattern://9c293034211ea47bd3e9c12b -->
+            <Response value="AUTH_CONTINUE"/>
+            <!-- source: pattern://9c293034211ea47bd3e9c12b -->
+            <property name="prioritiesSource" value="klp-profiles.conf"/>
+            <!-- source: pattern://9c293034211ea47bd3e9c12b -->
+            <property name="profileExpression" value="oauth2.scope.${notes:scope}.metadata.klp_profile"/>
         </AuthState>
         <AuthState name="cossa_realm_simulatelogin" class="ch.nevis.esauth.auth.states.standard.TransformAttributes" final="false">
             <!-- source: pattern://680c047dd9a5220fae3c9c3e -->
@@ -339,27 +336,6 @@
             <!-- source: pattern://a1e5d0192e082e689465a0c9 -->
             <property name="keyobjectref" value="tokensigner"/>
         </AuthState>
-        <AuthState name="cossa_realm_klpscope" class="ch.adnovum.cossa.KLPScopeToProfileBinding" final="false" resumeState="true">
-            <!-- source: pattern://9c293034211ea47bd3e9c12b -->
-            <ResultCond name="default" next="cossa_realm_CallPolicyVerificationAPI"/>
-            <!-- source: pattern://9c293034211ea47bd3e9c12b -->
-            <Response value="AUTH_CONTINUE"/>
-            <!-- source: pattern://9c293034211ea47bd3e9c12b -->
-            <property name="prioritiesSource" value="klp-profiles.conf"/>
-            <!-- source: pattern://9c293034211ea47bd3e9c12b -->
-            <property name="profileExpression" value="oauth2.scope.${session:scope}.metadata.klp_profile"/>
-        </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_CallPolicyVerificationAPI" class="ch.adnovum.cossa.CallPolicyVerificationAPI" final="false" resumeState="false">
             <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
             <ResultCond name="multiple_profiles" next="cossa_realm_Authentication_Failed"/>
@@ -381,12 +357,16 @@
             <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
             <property name="basicAuthPassword" value="testtesttest"/>
         </AuthState>
-        <AuthState name="cossa_realm_Auth_Done" class="ch.nevis.esauth.auth.states.standard.AuthDone" final="false">
+        <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_Authentication_Failed" class="ch.nevis.esauth.auth.states.standard.AuthError" final="false">
             <!-- source: pattern://5daa6d4f525b11a4e9b0ea79 -->
@@ -400,6 +380,13 @@
                 </Gui>
             </Response>
         </AuthState>
+        <AuthState name="cossa_realm_Auth_Done" class="ch.nevis.esauth.auth.states.standard.AuthDone" final="false">
+            <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
+            <Response value="AUTH_DONE">
+                <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
+                <Gui name="ContinueResponse"/>
+            </Response>
+        </AuthState>
         <AuthState name="cossa_realm_Selector" class="ch.nevis.esauth.auth.states.standard.ConditionalDispatcherState" final="false">
             <!-- source: pattern://b67f81a971e4c08aa79040a2 -->
             <ResultCond name="nomatch" next="cossa_realm_Prepare_Done"/>
diff --git a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/plugin/cossa-token-exchange-authstates.jar b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/plugin/cossa-token-exchange-authstates.jar
index 7abed99..257e34d 100644
Binary files a/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/plugin/cossa-token-exchange-authstates.jar and b/DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai/var/opt/nevisauth/default/plugin/cossa-token-exchange-authstates.jar differ