diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml
index a55fe6672f..61e5f448e2 100644
--- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml
+++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p1-identity.yaml
@@ -287,6 +287,7 @@ states:
     response:
       type: page
       pageId: photo-id-security-questions-find-another-way
+      context: dropout
     events:
       appTriage:
         targetState: APP_DOC_CHECK_PYI_ESCAPE
@@ -306,6 +307,44 @@ states:
             targetJourney: TECHNICAL_ERROR
             targetState: ERROR
 
+  PYI_CRI_ESCAPE:
+    response:
+      type: page
+      pageId: pyi-cri-escape
+    events:
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+      f2f:
+        targetJourney: F2F_HAND_OFF
+        targetState: START
+
+  PYI_CRI_ESCAPE_NO_F2F:
+    response:
+      type: page
+      pageId: pyi-cri-escape-no-f2f
+    events:
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+      end:
+        targetJourney: INELIGIBLE
+        targetState: INELIGIBLE_SKIP_MESSAGE
+
   # Common pages
   KBV_PHOTO_ID:
     nestedJourney: KBVS
@@ -321,7 +360,7 @@ states:
           processCandidateIdentity:
             targetState: PROCESS_NEW_IDENTITY
       enhanced-verification:
-        targetState: PYI_KBV_DROPOUT_PHOTO_ID
+        targetState: MITIGATION_KBV_FAIL_PHOTO_ID
         auditEvents:
           - IPV_MITIGATION_START
         auditContext:
@@ -450,6 +489,10 @@ states:
       f2f:
         targetJourney: F2F_HAND_OFF
         targetState: START
+        checkIfDisabled:
+          f2f:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
       appTriage:
         targetState: APP_DOC_CHECK_PYI_ESCAPE
         targetEntryEvent: next
@@ -500,6 +543,10 @@ states:
       f2f:
         targetJourney: F2F_HAND_OFF
         targetState: START
+        checkIfDisabled:
+          f2f:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
       appTriage:
         targetState: APP_DOC_CHECK_PYI_ESCAPE
         targetEntryEvent: next
@@ -617,6 +664,24 @@ states:
         targetState: INELIGIBLE
 
   # Mitigation journey (02)
+  MITIGATION_02_OPTIONS:
+    response:
+      type: page
+      pageId: pyi-suggest-other-options-no-f2f
+    events:
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+      end:
+        targetJourney: INELIGIBLE
+        targetState: INELIGIBLE
 
   STRATEGIC_APP_TRIAGE_PYI_ESCAPE:
     nestedJourney: STRATEGIC_APP_TRIAGE
@@ -683,6 +748,48 @@ states:
           processCandidateIdentity:
             targetState: PROCESS_INCOMPLETE_IDENTITY
 
+  MITIGATION_02_OPTIONS_WITH_F2F:
+    response:
+      type: page
+      pageId: pyi-suggest-other-options
+    events:
+      f2f:
+        targetJourney: F2F_HAND_OFF
+        targetState: START
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+
+  MITIGATION_KBV_FAIL_PHOTO_ID:
+    response:
+      type: page
+      pageId: photo-id-security-questions-find-another-way
+    events:
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+      f2f:
+        targetJourney: F2F_HAND_OFF
+        targetState: START
+        checkIfDisabled:
+          f2f:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+
   PYI_POST_OFFICE:
     response:
       type: page
diff --git a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml
index 31e8b9fd4e..2cef3e5053 100644
--- a/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml
+++ b/lambdas/process-journey-event/src/main/resources/statemachine/journey-maps/new-p2-identity.yaml
@@ -320,6 +320,7 @@ states:
     response:
       type: page
       pageId: photo-id-security-questions-find-another-way
+      context: dropout
     events:
       appTriage:
         targetState: APP_DOC_CHECK_PYI_ESCAPE
@@ -339,6 +340,44 @@ states:
             targetJourney: TECHNICAL_ERROR
             targetState: ERROR
 
+  PYI_CRI_ESCAPE:
+    response:
+      type: page
+      pageId: pyi-cri-escape
+    events:
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+      f2f:
+        targetJourney: F2F_HAND_OFF
+        targetState: START
+
+  PYI_CRI_ESCAPE_NO_F2F:
+    response:
+      type: page
+      pageId: pyi-cri-escape-no-f2f
+    events:
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+      end:
+        targetJourney: INELIGIBLE
+        targetState: INELIGIBLE_SKIP_MESSAGE
+
   # Common pages
   KBV_PHOTO_ID:
     nestedJourney: KBVS
@@ -354,7 +393,7 @@ states:
           processCandidateIdentity:
             targetState: PROCESS_NEW_IDENTITY
       enhanced-verification:
-        targetState: PYI_KBV_DROPOUT_PHOTO_ID
+        targetState: MITIGATION_KBV_FAIL_PHOTO_ID
         auditEvents:
           - IPV_MITIGATION_START
         auditContext:
@@ -497,6 +536,10 @@ states:
       f2f:
         targetJourney: F2F_HAND_OFF
         targetState: START
+        checkIfDisabled:
+          f2f:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
       appTriage:
         targetState: APP_DOC_CHECK_PYI_ESCAPE
         targetEntryEvent: next
@@ -560,6 +603,10 @@ states:
       f2f:
         targetJourney: F2F_HAND_OFF
         targetState: START
+        checkIfDisabled:
+          f2f:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
       appTriage:
         targetState: APP_DOC_CHECK_PYI_ESCAPE
         targetEntryEvent: next
@@ -677,6 +724,24 @@ states:
         targetState: INELIGIBLE
 
   # Mitigation journey (02)
+  MITIGATION_02_OPTIONS:
+    response:
+      type: page
+      pageId: pyi-suggest-other-options-no-f2f
+    events:
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+      end:
+        targetJourney: INELIGIBLE
+        targetState: INELIGIBLE
 
   STRATEGIC_APP_TRIAGE_PYI_ESCAPE:
     nestedJourney: STRATEGIC_APP_TRIAGE
@@ -743,6 +808,48 @@ states:
           processCandidateIdentity:
             targetState: PROCESS_INCOMPLETE_IDENTITY
 
+  MITIGATION_02_OPTIONS_WITH_F2F:
+    response:
+      type: page
+      pageId: pyi-suggest-other-options
+    events:
+      f2f:
+        targetJourney: F2F_HAND_OFF
+        targetState: START
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+
+  MITIGATION_KBV_FAIL_PHOTO_ID:
+    response:
+      type: page
+      pageId: photo-id-security-questions-find-another-way
+    events:
+      appTriage:
+        targetState: APP_DOC_CHECK_PYI_ESCAPE
+        targetEntryEvent: next
+        checkFeatureFlag:
+          strategicAppEnabled:
+            targetState: STRATEGIC_APP_TRIAGE_PYI_ESCAPE
+        checkIfDisabled:
+          dcmaw:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+      f2f:
+        targetJourney: F2F_HAND_OFF
+        targetState: START
+        checkIfDisabled:
+          f2f:
+            targetJourney: TECHNICAL_ERROR
+            targetState: ERROR
+
   PYI_POST_OFFICE:
     response:
       type: page