diff --git a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
index b7c210fc..5cd38580 100644
--- a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
@@ -51,6 +51,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
diff --git a/scenarios_pbx/invite/0005_test.yml.tt2 b/scenarios_pbx/invite/0005_test.yml.tt2
index b3a57aef..91c59573 100644
--- a/scenarios_pbx/invite/0005_test.yml.tt2
+++ b/scenarios_pbx/invite/0005_test.yml.tt2
@@ -56,6 +56,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
diff --git a/scenarios_pbx/invite_alias/0005_test.yml.tt2 b/scenarios_pbx/invite_alias/0005_test.yml.tt2
index 24f32813..a39c6bba 100644
--- a/scenarios_pbx/invite_alias/0005_test.yml.tt2
+++ b/scenarios_pbx/invite_alias/0005_test.yml.tt2
@@ -53,6 +53,8 @@ flow:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_LOAD_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
diff --git a/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2 b/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2
index 57342b22..5d8d51b1 100644
--- a/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid/0009_test.yml.tt2
@@ -51,6 +51,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
diff --git a/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2 b/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2
index c16e7490..4b0902fa 100644
--- a/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2
+++ b/scenarios_pbx/invite_alias_devid_fulllookup/0009_test.yml.tt2
@@ -51,6 +51,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
diff --git a/scenarios_pbx/invite_group_parallel_and_cft/0009_test.yml.tt2 b/scenarios_pbx/invite_group_parallel_and_cft/0009_test.yml.tt2
index 3c4322ba..76dc05be 100644
--- a/scenarios_pbx/invite_group_parallel_and_cft/0009_test.yml.tt2
+++ b/scenarios_pbx/invite_group_parallel_and_cft/0009_test.yml.tt2
@@ -51,6 +51,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
@@ -185,5 +187,5 @@ sip_out:
       'P-Huntgroup-Members: sip:[% scenarios.0.responders.1.username %]@invite-group-parallel-and-cft.scenarios-pbx.test,sip:[% scenarios.0.responders.2.username %]@invite-group-parallel-and-cft.scenarios-pbx.test',
       'P-Hunting-Policy: parallel',
       'P-App-Name: sbc',
-      'P-App-Param: ;profile=ngcp_pbx;a_park_domain=379;b_park_domain=379',
+      'P-App-Param: ;profile=ngcp_pbx;a_park_domain=[0-9]+;b_park_domain=[0-9]+',
     ]
diff --git a/scenarios_pbx/invite_group_parallel_and_cft/0010_test.yml.tt2 b/scenarios_pbx/invite_group_parallel_and_cft/0010_test.yml.tt2
index fc01f7dc..12a9d1e1 100644
--- a/scenarios_pbx/invite_group_parallel_and_cft/0010_test.yml.tt2
+++ b/scenarios_pbx/invite_group_parallel_and_cft/0010_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
@@ -168,6 +170,6 @@ sip_out:
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
       'P-To-Group-Policy: parallel',
-      'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=379;b_park_domain=379',
+      'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[0-9]+;b_park_domain=[0-9]+',
       'P-App-Name: sbc',
     ]
diff --git a/scenarios_pbx/invite_group_parallel_and_cft/0011_test.yml.tt2 b/scenarios_pbx/invite_group_parallel_and_cft/0011_test.yml.tt2
index a81a927d..813d5744 100644
--- a/scenarios_pbx/invite_group_parallel_and_cft/0011_test.yml.tt2
+++ b/scenarios_pbx/invite_group_parallel_and_cft/0011_test.yml.tt2
@@ -49,6 +49,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
@@ -170,6 +172,6 @@ sip_out:
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
       'P-To-Group-Policy: parallel',
-      'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=379;b_park_domain=379',
+      'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no;hold_alter_b2b_bleg=no;hold_alter_b2b_aleg=no;fast_ack=no;a_park_domain=[0-9]+;b_park_domain=[0-9]+',
       'P-App-Name: sbc',
     ]
diff --git a/scenarios_pbx/invite_group_parallel_and_cft/0025_test.yml.tt2 b/scenarios_pbx/invite_group_parallel_and_cft/0025_test.yml.tt2
index 61a8961f..09bb0e45 100644
--- a/scenarios_pbx/invite_group_parallel_and_cft/0025_test.yml.tt2
+++ b/scenarios_pbx/invite_group_parallel_and_cft/0025_test.yml.tt2
@@ -48,6 +48,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
diff --git a/scenarios_pbx/invite_shared_line/0005_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0005_test.yml.tt2
index 18cfaedd..361952c6 100644
--- a/scenarios_pbx/invite_shared_line/0005_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0005_test.yml.tt2
@@ -51,6 +51,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF:
diff --git a/scenarios_pbx/invite_username_devid/0009_test.yml.tt2 b/scenarios_pbx/invite_username_devid/0009_test.yml.tt2
index 6f630042..ed31a5fc 100644
--- a/scenarios_pbx/invite_username_devid/0009_test.yml.tt2
+++ b/scenarios_pbx/invite_username_devid/0009_test.yml.tt2
@@ -51,6 +51,8 @@ flow:
   - return|ROUTE_CHECK_CLI_ALLOWED:
   - return|ROUTE_CHECK_USERPROV_CLI:
   - start|ROUTE_FIND_CALLEE:
+  - start|ROUTE_DETECT_LOOP:
+  - return|ROUTE_DETECT_LOOP:
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_LOAD_CALLEE_PREF: