diff --git a/scenarios/incoming_foreign_dom/0007_test.yml.tt2 b/scenarios/incoming_foreign_dom/0007_test.yml.tt2
index e0976cd0..f7cf120c 100644
--- a/scenarios/incoming_foreign_dom/0007_test.yml.tt2
+++ b/scenarios/incoming_foreign_dom/0007_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 1 ACK'
   - 'From: <sip:external@'
   - 'To: <sip:4311003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 1 ACK',
       'From: <sip:external@',
       'To: <sip:4311003@'
diff --git a/scenarios/incoming_foreign_dom/0008_test.yml.tt2 b/scenarios/incoming_foreign_dom/0008_test.yml.tt2
index 5b13f305..a590d2b5 100644
--- a/scenarios/incoming_foreign_dom/0008_test.yml.tt2
+++ b/scenarios/incoming_foreign_dom/0008_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:external@'
   - 'CSeq: 2 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:4311003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:external@',
       'CSeq: 2 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/incoming_hih/0005_test.yml.tt2 b/scenarios/incoming_hih/0005_test.yml.tt2
index a81b8832..fc6f3879 100644
--- a/scenarios/incoming_hih/0005_test.yml.tt2
+++ b/scenarios/incoming_hih/0005_test.yml.tt2
@@ -198,7 +198,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:4311002@'
-  - 'Contact: <sip:127.0.0.1:5080'
+  - 'Contact: <sip:127.0.0.1:508[0|8]'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: \w+'
@@ -219,7 +219,7 @@ sip_out:
       '^INVITE sip:testuser1002@',
       'CSeq: \d+ INVITE',
       'From: <sip:004321001@',
-      'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
+      'Contact: <sip:127.0.0.1:508[0|8](;transport=udp)?>',
       'To: <sip:4311003@',
       'Content-Type: application/sdp',
       'History-Info: <sip:\+4313012026@spce.test;user=phone\?privacy=history>;index=1',
diff --git a/scenarios/incoming_hih/0011_test.yml.tt2 b/scenarios/incoming_hih/0011_test.yml.tt2
index 7bdfb7ab..20f53057 100644
--- a/scenarios/incoming_hih/0011_test.yml.tt2
+++ b/scenarios/incoming_hih/0011_test.yml.tt2
@@ -20,7 +20,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:004321001@'
   - 'CSeq: 1 ACK'
   - 'Max-Forwards: 69'
@@ -30,7 +30,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:004321001@',
       'CSeq: 1 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/incoming_hih/0013_test.yml.tt2 b/scenarios/incoming_hih/0013_test.yml.tt2
index cad5506c..bdb165a0 100644
--- a/scenarios/incoming_hih/0013_test.yml.tt2
+++ b/scenarios/incoming_hih/0013_test.yml.tt2
@@ -25,7 +25,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:004321001@'
   - 'CSeq: 2 BYE'
   - 'Max-Forwards: 69'
@@ -42,7 +42,7 @@ sip_out:
       'To: <sip:4311003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:004321001@',
       'CSeq: 2 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/incoming_hih/0014_test.yml.tt2 b/scenarios/incoming_hih/0014_test.yml.tt2
index 3dba58b1..f7022f7c 100644
--- a/scenarios/incoming_hih/0014_test.yml.tt2
+++ b/scenarios/incoming_hih/0014_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
+  - '^BYE sip:(testuser1002@)?127.0.0.1:508[0|8](;transport=udp)? SIP/2.0'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:004321001@'
@@ -42,7 +42,7 @@ sip_out:
       'To: <sip:4311003@'
     ]
   - [
-      '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
+      '^BYE sip:(testuser1002@)?127.0.0.1:508[0|8](;transport=udp)? SIP/2.0',
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
diff --git a/scenarios/incoming_peer/0007_test.yml.tt2 b/scenarios/incoming_peer/0007_test.yml.tt2
index ca3671bc..058e050f 100644
--- a/scenarios/incoming_peer/0007_test.yml.tt2
+++ b/scenarios/incoming_peer/0007_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 1 ACK'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 1 ACK',
       'From: <sip:004321001@',
       'To: <sip:4311003@'
diff --git a/scenarios/incoming_peer/0008_test.yml.tt2 b/scenarios/incoming_peer/0008_test.yml.tt2
index 906e5c3e..a189bd72 100644
--- a/scenarios/incoming_peer/0008_test.yml.tt2
+++ b/scenarios/incoming_peer/0008_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:004321001@'
   - 'CSeq: 2 BYE'
   - 'Max-Forwards: 69'
@@ -46,7 +46,7 @@ sip_out:
       'To: <sip:4311003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:004321001@',
       'CSeq: 2 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite/0009_test.yml.tt2 b/scenarios/invite/0009_test.yml.tt2
index c3889190..f08a4a7e 100644
--- a/scenarios/invite/0009_test.yml.tt2
+++ b/scenarios/invite/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:4311002@',
       'To: <sip:testuser1003@'
diff --git a/scenarios/invite/0010_test.yml.tt2 b/scenarios/invite/0010_test.yml.tt2
index 54eac48e..97b0dfa3 100644
--- a/scenarios/invite/0010_test.yml.tt2
+++ b/scenarios/invite/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_allowedcli_match/0009_test.yml.tt2 b/scenarios/invite_allowedcli_match/0009_test.yml.tt2
index f536a8f8..f58dad65 100644
--- a/scenarios/invite_allowedcli_match/0009_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: "431100299" <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: "431100299" <sip:431100299@',
       'To: <sip:testuser1003@'
diff --git a/scenarios/invite_allowedcli_match/0010_test.yml.tt2 b/scenarios/invite_allowedcli_match/0010_test.yml.tt2
index 581f771e..5038dbdc 100644
--- a/scenarios/invite_allowedcli_match/0010_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2
index 10d846a7..89862e90 100644
--- a/scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: "4311009" <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: "4311009" <sip:4311009@',
       'To: <sip:testuser1003@'
diff --git a/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2 b/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2
index 87a66f04..5f3b78da 100644
--- a/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2
+++ b/scenarios/invite_allowedcli_match_alias/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2
index 22058cd5..088d7625 100644
--- a/scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: "431100222" <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: "431100222" <sip:43122122@',
       'To: <sip:testuser1003@'
diff --git a/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2 b/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2
index a88f6a5c..f3f618b3 100644
--- a/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2
+++ b/scenarios/invite_allowedcli_nonmatch/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_allowip_soundset/0003_test.yml.tt2 b/scenarios/invite_allowip_soundset/0003_test.yml.tt2
index f1e8149b..48ed90ea 100644
--- a/scenarios/invite_allowip_soundset/0003_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/0003_test.yml.tt2
@@ -123,5 +123,5 @@ sip_out:
       'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
       'P-Callee-UUID: [% spce_test.testuser1002.uuid %]',
       'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002',
-      'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5080;primary=4311002',
+      'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=508[0|8];primary=4311002',
     ]
diff --git a/scenarios/invite_allowip_soundset/0004_test.yml.tt2 b/scenarios/invite_allowip_soundset/0004_test.yml.tt2
index d564179e..b3473778 100644
--- a/scenarios/invite_allowip_soundset/0004_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/0004_test.yml.tt2
@@ -19,13 +19,13 @@ sip_in:
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
   - 'CSeq: 2 INVITE'
-  - 'Contact: <sip:(earlyannounce@)?127.0.0.1:5080(;transport=udp)?>'
+  - 'Contact: <sip:(earlyannounce@)?127.0.0.1:508[0|8](;transport=udp)?>'
   - 'Content-Type: application/sdp'
   - 'Content-Length: \d+'
 sip_out:
   - [
       '^SIP/2.0 183 Progress',
-      'Contact: <sip:(earlyannounce@)?127.0.0.1:5080(;transport=udp)?>',
+      'Contact: <sip:(earlyannounce@)?127.0.0.1:508[0|8](;transport=udp)?>',
       'Content-Type: application/sdp',
       'Content-Length: \d+',
       'P-Out-Socket: udp:127.0.0.1:5060'
diff --git a/scenarios/invite_anonymous/0009_test.yml.tt2 b/scenarios/invite_anonymous/0009_test.yml.tt2
index 7bd37cda..b6421269 100644
--- a/scenarios/invite_anonymous/0009_test.yml.tt2
+++ b/scenarios/invite_anonymous/0009_test.yml.tt2
@@ -24,14 +24,14 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - '_:NOT:_P-Asserted-Identity: \w+'
   - 'From: "Anonymous" <sip:anonymous@anonymous.invalid>'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       '_:NOT:_P-Asserted-Identity: \w+',
       'From: "Anonymous" <sip:anonymous@anonymous.invalid>',
diff --git a/scenarios/invite_anonymous/0010_test.yml.tt2 b/scenarios/invite_anonymous/0010_test.yml.tt2
index 0c8aa0a1..794f3c98 100644
--- a/scenarios/invite_anonymous/0010_test.yml.tt2
+++ b/scenarios/invite_anonymous/0010_test.yml.tt2
@@ -27,7 +27,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_blockout_pinoverride/0009_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0009_test.yml.tt2
index cc2f8ba3..11e1271b 100644
--- a/scenarios/invite_blockout_pinoverride/0009_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:\*80\*4444311003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:4311002@',
       'To: <sip:\*80\*4444311003@'
diff --git a/scenarios/invite_blockout_pinoverride/0010_test.yml.tt2 b/scenarios/invite_blockout_pinoverride/0010_test.yml.tt2
index fe230da9..c9c19f01 100644
--- a/scenarios/invite_blockout_pinoverride/0010_test.yml.tt2
+++ b/scenarios/invite_blockout_pinoverride/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:\*80\*4444311003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_callforward/0011_test.yml.tt2 b/scenarios/invite_callforward/0011_test.yml.tt2
index 39c850e7..11675a94 100644
--- a/scenarios/invite_callforward/0011_test.yml.tt2
+++ b/scenarios/invite_callforward/0011_test.yml.tt2
@@ -197,7 +197,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:4311003@'
-  - 'Contact: <sip:127.0.0.1:5080'
+  - 'Contact: <sip:127.0.0.1:508[0|8]'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
@@ -218,7 +218,7 @@ sip_out:
       '^INVITE sip:testuser1003@',
       'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
-      'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
+      'Contact: <sip:127.0.0.1:508[0|8](;transport=udp)?>',
       'To: <sip:testuser1001@',
       'Content-Type: application/sdp',
       'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
diff --git a/scenarios/invite_callforward/0017_test.yml.tt2 b/scenarios/invite_callforward/0017_test.yml.tt2
index 454122d2..28be971d 100644
--- a/scenarios/invite_callforward/0017_test.yml.tt2
+++ b/scenarios/invite_callforward/0017_test.yml.tt2
@@ -20,7 +20,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -30,7 +30,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_callforward/0019_test.yml.tt2 b/scenarios/invite_callforward/0019_test.yml.tt2
index 2a179818..82a56035 100644
--- a/scenarios/invite_callforward/0019_test.yml.tt2
+++ b/scenarios/invite_callforward/0019_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -43,7 +43,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_callforward/0020_test.yml.tt2 b/scenarios/invite_callforward/0020_test.yml.tt2
index 0d9c3f20..dfa0b8da 100644
--- a/scenarios/invite_callforward/0020_test.yml.tt2
+++ b/scenarios/invite_callforward/0020_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
@@ -42,7 +42,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0',
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
diff --git a/scenarios/invite_callforward/0029_test.yml.tt2 b/scenarios/invite_callforward/0029_test.yml.tt2
index 1708ce1e..a1397e6f 100644
--- a/scenarios/invite_callforward/0029_test.yml.tt2
+++ b/scenarios/invite_callforward/0029_test.yml.tt2
@@ -188,7 +188,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:4311005@'
-  - 'Contact: <sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)?>'
+  - 'Contact: <sip:(testuser1003@)?127.0.0.1:508[0|8](;transport=udp)?>'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
 sip_out:
diff --git a/scenarios/invite_callforward/0037_test.yml.tt2 b/scenarios/invite_callforward/0037_test.yml.tt2
index d410caa7..a5d6f0ac 100644
--- a/scenarios/invite_callforward/0037_test.yml.tt2
+++ b/scenarios/invite_callforward/0037_test.yml.tt2
@@ -27,7 +27,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -44,7 +44,7 @@ sip_out:
       'To: <sip:testuser1004@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_callforward/0038_test.yml.tt2 b/scenarios/invite_callforward/0038_test.yml.tt2
index 33e8b12b..7e8ad42f 100644
--- a/scenarios/invite_callforward/0038_test.yml.tt2
+++ b/scenarios/invite_callforward/0038_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
+  - '^BYE sip:(testuser1002@)?127.0.0.1:508[0|8](;transport=udp)? SIP/2.0'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
@@ -42,7 +42,7 @@ sip_out:
       'To: <sip:testuser1004@'
     ]
   - [
-      '^BYE sip:(testuser1002@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
+      '^BYE sip:(testuser1002@)?127.0.0.1:508[0|8](;transport=udp)? SIP/2.0',
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
diff --git a/scenarios/invite_concurrent_max/0016_test.yml.tt2 b/scenarios/invite_concurrent_max/0016_test.yml.tt2
index 54eac48e..97b0dfa3 100644
--- a/scenarios/invite_concurrent_max/0016_test.yml.tt2
+++ b/scenarios/invite_concurrent_max/0016_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_conference_update/0005_test.yml.tt2 b/scenarios/invite_conference_update/0005_test.yml.tt2
index ceff38c1..e8af2722 100644
--- a/scenarios/invite_conference_update/0005_test.yml.tt2
+++ b/scenarios/invite_conference_update/0005_test.yml.tt2
@@ -127,7 +127,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:conf=4311001@conference.local SIP/2.0'
-  - 'Contact: <sip:127.0.0.1:5080(;transport=udp)?>'
+  - 'Contact: <sip:127.0.0.1:508[0|8](;transport=udp)?>'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
@@ -147,6 +147,6 @@ sip_out:
       'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
       'To: <sip:testuser1001@',
-      'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
+      'Contact: <sip:127.0.0.1:508[0|8](;transport=udp)?>',
       'Content-Type: application/sdp'
     ]
diff --git a/scenarios/invite_conference_update/0008_test.yml.tt2 b/scenarios/invite_conference_update/0008_test.yml.tt2
index 4f9463e4..98b1dcbe 100644
--- a/scenarios/invite_conference_update/0008_test.yml.tt2
+++ b/scenarios/invite_conference_update/0008_test.yml.tt2
@@ -20,7 +20,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -29,7 +29,7 @@ sip_in:
   - 'To: <sip:testuser1001@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_conference_update/0010_test.yml.tt2 b/scenarios/invite_conference_update/0010_test.yml.tt2
index d10b6092..8f14d9ec 100644
--- a/scenarios/invite_conference_update/0010_test.yml.tt2
+++ b/scenarios/invite_conference_update/0010_test.yml.tt2
@@ -20,7 +20,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^UPDATE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0'
+  - '^UPDATE sip:127.0.0.1:508[0|8](;prxroute=1)?(;transport=udp)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 UPDATE'
   - 'Max-Forwards: 69'
@@ -37,7 +37,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^UPDATE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0',
+      '^UPDATE sip:127.0.0.1:508[0|8](;prxroute=1)?(;transport=udp)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 UPDATE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_conference_update/0011_test.yml.tt2 b/scenarios/invite_conference_update/0011_test.yml.tt2
index 31c46928..0416f9dd 100644
--- a/scenarios/invite_conference_update/0011_test.yml.tt2
+++ b/scenarios/invite_conference_update/0011_test.yml.tt2
@@ -14,7 +14,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^UPDATE sip:127.0.0.1:5080;transport=udp SIP/2.0'
+  - '^UPDATE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0'
   - 'CSeq: \d+ UPDATE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
diff --git a/scenarios/invite_conference_update/0013_test.yml.tt2 b/scenarios/invite_conference_update/0013_test.yml.tt2
index 16122c2d..a7d5c202 100644
--- a/scenarios/invite_conference_update/0013_test.yml.tt2
+++ b/scenarios/invite_conference_update/0013_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)?(;transport=udp)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 4 BYE'
   - 'Max-Forwards: 69'
@@ -43,7 +43,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)?(;transport=udp)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 4 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_conference_update/0014_test.yml.tt2 b/scenarios/invite_conference_update/0014_test.yml.tt2
index 0d9c3f20..dfa0b8da 100644
--- a/scenarios/invite_conference_update/0014_test.yml.tt2
+++ b/scenarios/invite_conference_update/0014_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
@@ -42,7 +42,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0',
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
diff --git a/scenarios/invite_foreign_dom/0007_test.yml.tt2 b/scenarios/invite_foreign_dom/0007_test.yml.tt2
index d249638b..8f3f1299 100644
--- a/scenarios/invite_foreign_dom/0007_test.yml.tt2
+++ b/scenarios/invite_foreign_dom/0007_test.yml.tt2
@@ -24,7 +24,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -34,7 +34,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_foreign_dom/0008_test.yml.tt2 b/scenarios/invite_foreign_dom/0008_test.yml.tt2
index 2fe1d0d2..7060fe24 100644
--- a/scenarios/invite_foreign_dom/0008_test.yml.tt2
+++ b/scenarios/invite_foreign_dom/0008_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:004321001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_hdr/0009_test.yml.tt2 b/scenarios/invite_hdr/0009_test.yml.tt2
index e408c4f7..1cc74bd9 100644
--- a/scenarios/invite_hdr/0009_test.yml.tt2
+++ b/scenarios/invite_hdr/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'FrOm: <sip:testuser1002@'
   - 'to: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'FrOm: <sip:4311002@',
       'to: <sip:testuser1003@'
diff --git a/scenarios/invite_hdr/0010_test.yml.tt2 b/scenarios/invite_hdr/0010_test.yml.tt2
index 1d088b32..5bee6c6d 100644
--- a/scenarios/invite_hdr/0010_test.yml.tt2
+++ b/scenarios/invite_hdr/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'TO: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_hm/0009_test.yml.tt2 b/scenarios/invite_hm/0009_test.yml.tt2
index c3889190..f08a4a7e 100644
--- a/scenarios/invite_hm/0009_test.yml.tt2
+++ b/scenarios/invite_hm/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:4311002@',
       'To: <sip:testuser1003@'
diff --git a/scenarios/invite_hm/0010_test.yml.tt2 b/scenarios/invite_hm/0010_test.yml.tt2
index 54eac48e..97b0dfa3 100644
--- a/scenarios/invite_hm/0010_test.yml.tt2
+++ b/scenarios/invite_hm/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_hm_callforward/0007_test.yml.tt2 b/scenarios/invite_hm_callforward/0007_test.yml.tt2
index 7f2e8b53..8dcbcece 100644
--- a/scenarios/invite_hm_callforward/0007_test.yml.tt2
+++ b/scenarios/invite_hm_callforward/0007_test.yml.tt2
@@ -197,7 +197,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:4311003@'
-  - 'Contact: <sip:127.0.0.1:5080'
+  - 'Contact: <sip:127.0.0.1:508[0|8]'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
@@ -218,7 +218,7 @@ sip_out:
       '^INVITE sip:testuser1003@',
       'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
-      'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
+      'Contact: <sip:127.0.0.1:508[0|8](;transport=udp)?>',
       'To: <sip:testuser1001@',
       'Content-Type: application/sdp',
       'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
diff --git a/scenarios/invite_hm_callforward/0013_test.yml.tt2 b/scenarios/invite_hm_callforward/0013_test.yml.tt2
index 454122d2..28be971d 100644
--- a/scenarios/invite_hm_callforward/0013_test.yml.tt2
+++ b/scenarios/invite_hm_callforward/0013_test.yml.tt2
@@ -20,7 +20,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -30,7 +30,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_hm_callforward/0015_test.yml.tt2 b/scenarios/invite_hm_callforward/0015_test.yml.tt2
index 2a179818..82a56035 100644
--- a/scenarios/invite_hm_callforward/0015_test.yml.tt2
+++ b/scenarios/invite_hm_callforward/0015_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -43,7 +43,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_hm_callforward/0016_test.yml.tt2 b/scenarios/invite_hm_callforward/0016_test.yml.tt2
index 0d9c3f20..dfa0b8da 100644
--- a/scenarios/invite_hm_callforward/0016_test.yml.tt2
+++ b/scenarios/invite_hm_callforward/0016_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
@@ -42,7 +42,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0',
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
diff --git a/scenarios/invite_hm_peerout/0007_test.yml.tt2 b/scenarios/invite_hm_peerout/0007_test.yml.tt2
index 45b43548..281f7469 100644
--- a/scenarios/invite_hm_peerout/0007_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0007_test.yml.tt2
@@ -25,7 +25,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -35,7 +35,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_hm_peerout/0008_test.yml.tt2 b/scenarios/invite_hm_peerout/0008_test.yml.tt2
index b954a595..be2a1f23 100644
--- a/scenarios/invite_hm_peerout/0008_test.yml.tt2
+++ b/scenarios/invite_hm_peerout/0008_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -46,7 +46,7 @@ sip_out:
       'To: <sip:004321001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_ignore_allowip/0009_test.yml.tt2 b/scenarios/invite_ignore_allowip/0009_test.yml.tt2
index c3889190..f08a4a7e 100644
--- a/scenarios/invite_ignore_allowip/0009_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:4311002@',
       'To: <sip:testuser1003@'
diff --git a/scenarios/invite_ignore_allowip/0010_test.yml.tt2 b/scenarios/invite_ignore_allowip/0010_test.yml.tt2
index 54eac48e..97b0dfa3 100644
--- a/scenarios/invite_ignore_allowip/0010_test.yml.tt2
+++ b/scenarios/invite_ignore_allowip/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_lateoam/0009_test.yml.tt2 b/scenarios/invite_lateoam/0009_test.yml.tt2
index e5729d87..d987070a 100644
--- a/scenarios/invite_lateoam/0009_test.yml.tt2
+++ b/scenarios/invite_lateoam/0009_test.yml.tt2
@@ -24,14 +24,14 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:4311002@',
       'To: <sip:testuser1003@',
diff --git a/scenarios/invite_lateoam/0010_test.yml.tt2 b/scenarios/invite_lateoam/0010_test.yml.tt2
index 54eac48e..97b0dfa3 100644
--- a/scenarios/invite_lateoam/0010_test.yml.tt2
+++ b/scenarios/invite_lateoam/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_no_refer/0009_test.yml.tt2 b/scenarios/invite_no_refer/0009_test.yml.tt2
index c3889190..f08a4a7e 100644
--- a/scenarios/invite_no_refer/0009_test.yml.tt2
+++ b/scenarios/invite_no_refer/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:4311002@',
       'To: <sip:testuser1003@'
diff --git a/scenarios/invite_no_refer/0010_test.yml.tt2 b/scenarios/invite_no_refer/0010_test.yml.tt2
index 54eac48e..97b0dfa3 100644
--- a/scenarios/invite_no_refer/0010_test.yml.tt2
+++ b/scenarios/invite_no_refer/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout/0007_test.yml.tt2 b/scenarios/invite_peerout/0007_test.yml.tt2
index 45b43548..281f7469 100644
--- a/scenarios/invite_peerout/0007_test.yml.tt2
+++ b/scenarios/invite_peerout/0007_test.yml.tt2
@@ -25,7 +25,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -35,7 +35,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout/0008_test.yml.tt2 b/scenarios/invite_peerout/0008_test.yml.tt2
index b954a595..be2a1f23 100644
--- a/scenarios/invite_peerout/0008_test.yml.tt2
+++ b/scenarios/invite_peerout/0008_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -46,7 +46,7 @@ sip_out:
       'To: <sip:004321001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout_failover/0009_test.yml.tt2 b/scenarios/invite_peerout_failover/0009_test.yml.tt2
index 45b43548..281f7469 100644
--- a/scenarios/invite_peerout_failover/0009_test.yml.tt2
+++ b/scenarios/invite_peerout_failover/0009_test.yml.tt2
@@ -25,7 +25,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -35,7 +35,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout_failover/0010_test.yml.tt2 b/scenarios/invite_peerout_failover/0010_test.yml.tt2
index b954a595..be2a1f23 100644
--- a/scenarios/invite_peerout_failover/0010_test.yml.tt2
+++ b/scenarios/invite_peerout_failover/0010_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -46,7 +46,7 @@ sip_out:
       'To: <sip:004321001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout_max_out/0007_test.yml.tt2 b/scenarios/invite_peerout_max_out/0007_test.yml.tt2
index 45b43548..281f7469 100644
--- a/scenarios/invite_peerout_max_out/0007_test.yml.tt2
+++ b/scenarios/invite_peerout_max_out/0007_test.yml.tt2
@@ -25,7 +25,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -35,7 +35,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout_max_out/0008_test.yml.tt2 b/scenarios/invite_peerout_max_out/0008_test.yml.tt2
index b954a595..be2a1f23 100644
--- a/scenarios/invite_peerout_max_out/0008_test.yml.tt2
+++ b/scenarios/invite_peerout_max_out/0008_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -46,7 +46,7 @@ sip_out:
       'To: <sip:004321001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout_rewrite/0007_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0007_test.yml.tt2
index d249638b..8f3f1299 100644
--- a/scenarios/invite_peerout_rewrite/0007_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0007_test.yml.tt2
@@ -24,7 +24,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -34,7 +34,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout_rewrite/0008_test.yml.tt2 b/scenarios/invite_peerout_rewrite/0008_test.yml.tt2
index 2fe1d0d2..7060fe24 100644
--- a/scenarios/invite_peerout_rewrite/0008_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite/0008_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:004321001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2
index 06db66f6..d85ff0da 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0007_test.yml.tt2
@@ -24,7 +24,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -34,7 +34,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2
index dae01947..6c0615bf 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0008_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:004321001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_record_call/0011_test.yml.tt2 b/scenarios/invite_record_call/0011_test.yml.tt2
index c3889190..f08a4a7e 100644
--- a/scenarios/invite_record_call/0011_test.yml.tt2
+++ b/scenarios/invite_record_call/0011_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:4311002@',
       'To: <sip:testuser1003@'
diff --git a/scenarios/invite_record_call/0012_test.yml.tt2 b/scenarios/invite_record_call/0012_test.yml.tt2
index 54eac48e..97b0dfa3 100644
--- a/scenarios/invite_record_call/0012_test.yml.tt2
+++ b/scenarios/invite_record_call/0012_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_redirect/0013_test.yml.tt2 b/scenarios/invite_redirect/0013_test.yml.tt2
index 8d1a4e29..f4a207fe 100644
--- a/scenarios/invite_redirect/0013_test.yml.tt2
+++ b/scenarios/invite_redirect/0013_test.yml.tt2
@@ -24,7 +24,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -34,7 +34,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_redirect/0014_test.yml.tt2 b/scenarios/invite_redirect/0014_test.yml.tt2
index 54eac48e..97b0dfa3 100644
--- a/scenarios/invite_redirect/0014_test.yml.tt2
+++ b/scenarios/invite_redirect/0014_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_retrans/0009_test.yml.tt2 b/scenarios/invite_retrans/0009_test.yml.tt2
index c3889190..f08a4a7e 100644
--- a/scenarios/invite_retrans/0009_test.yml.tt2
+++ b/scenarios/invite_retrans/0009_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:testuser1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:4311002@',
       'To: <sip:testuser1003@'
diff --git a/scenarios/invite_retrans/0010_test.yml.tt2 b/scenarios/invite_retrans/0010_test.yml.tt2
index 54eac48e..97b0dfa3 100644
--- a/scenarios/invite_retrans/0010_test.yml.tt2
+++ b/scenarios/invite_retrans/0010_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_tcp_udp/0010_test.yml.tt2 b/scenarios/invite_tcp_udp/0010_test.yml.tt2
index 3f46cbd9..d5e80681 100644
--- a/scenarios/invite_tcp_udp/0010_test.yml.tt2
+++ b/scenarios/invite_tcp_udp/0010_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - exit|ROUTE_EXIT:
       $avp(proto): ["tcp"]
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: <sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -46,7 +46,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: <sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2
index 9d7219a5..437fe976 100644
--- a/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0010_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
       $avp(proto): ["udp"]
 sip_in:
   - '^INVITE'
-  - 'Contact: <sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)?>'
+  - 'Contact: <sip:(testuser1003@)?127.0.0.1:508[0|8](;transport=udp)?>'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
 sip_out:
diff --git a/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2 b/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2
index d0d5b737..e6e67e5f 100644
--- a/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2
+++ b/scenarios/invite_tcp_udp_reinvite/0013_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: <sip:testuser1002@'
   - 'CSeq: \d+ BYE'
   - 'Max-Forwards: 69'
@@ -46,7 +46,7 @@ sip_out:
       'To: <sip:testuser1003@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: <sip:testuser1002@',
       'CSeq: \d+ BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_trusted_anonymous/0007_test.yml.tt2 b/scenarios/invite_trusted_anonymous/0007_test.yml.tt2
index 488b776d..0237795b 100644
--- a/scenarios/invite_trusted_anonymous/0007_test.yml.tt2
+++ b/scenarios/invite_trusted_anonymous/0007_test.yml.tt2
@@ -24,14 +24,14 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 1 ACK'
   - 'From: "Anonymous" <sip:anonymous@anonymous.invalid>'
   - 'To: <sip:testuser1003@'
   - '_:NOT:_P-Asserted-Identity: \w+'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 1 ACK',
       'From: "Anonymous" <sip:anonymous@anonymous.invalid>',
       'To: <sip:testuser1003@',
diff --git a/scenarios/invite_trusted_anonymous/0008_test.yml.tt2 b/scenarios/invite_trusted_anonymous/0008_test.yml.tt2
index 8982fe53..12909d43 100644
--- a/scenarios/invite_trusted_anonymous/0008_test.yml.tt2
+++ b/scenarios/invite_trusted_anonymous/0008_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 BYE'
   - 'Max-Forwards: 69'
@@ -46,7 +46,7 @@ sip_out:
       '_:NOT:_P-Asserted-Identity: \w+'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_voicebox/0005_test.yml.tt2 b/scenarios/invite_voicebox/0005_test.yml.tt2
index 1ed44518..84055840 100644
--- a/scenarios/invite_voicebox/0005_test.yml.tt2
+++ b/scenarios/invite_voicebox/0005_test.yml.tt2
@@ -125,7 +125,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:vmu4311001@voicebox.local SIP/2.0'
-  - 'Contact: <sip:127.0.0.1:5080(;transport=udp)?>'
+  - 'Contact: <sip:127.0.0.1:508[0|8](;transport=udp)?>'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
@@ -145,6 +145,6 @@ sip_out:
       'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
       'To: <sip:testuser1001@',
-      'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
+      'Contact: <sip:127.0.0.1:508[0|8](;transport=udp)?>',
       'Content-Type: application/sdp'
     ]
diff --git a/scenarios/invite_voicebox/0009_test.yml.tt2 b/scenarios/invite_voicebox/0009_test.yml.tt2
index 4f9463e4..98b1dcbe 100644
--- a/scenarios/invite_voicebox/0009_test.yml.tt2
+++ b/scenarios/invite_voicebox/0009_test.yml.tt2
@@ -20,7 +20,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -29,7 +29,7 @@ sip_in:
   - 'To: <sip:testuser1001@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/invite_voicebox/0011_test.yml.tt2 b/scenarios/invite_voicebox/0011_test.yml.tt2
index 57a34631..b8e2f9d9 100644
--- a/scenarios/invite_voicebox/0011_test.yml.tt2
+++ b/scenarios/invite_voicebox/0011_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)?(;transport=udp)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -43,7 +43,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)?(;transport=udp)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)?(;transport=udp)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/lock_ported/0007_test.yml.tt2 b/scenarios/lock_ported/0007_test.yml.tt2
index 081d24c6..dc0bf4ac 100644
--- a/scenarios/lock_ported/0007_test.yml.tt2
+++ b/scenarios/lock_ported/0007_test.yml.tt2
@@ -199,7 +199,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:4311003@'
-  - 'Contact: <sip:127.0.0.1:5080'
+  - 'Contact: <sip:127.0.0.1:508[0|8]'
   - 'CSeq: \d+ INVITE'
   - 'Content-Type: application/sdp'
   - 'P-Caller-UUID: [% spce_test.testuser1001.uuid %]'
@@ -220,7 +220,7 @@ sip_out:
       '^INVITE sip:testuser1003@',
       'CSeq: \d+ INVITE',
       'From: <sip:4311002@',
-      'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
+      'Contact: <sip:127.0.0.1:508[0|8](;transport=udp)?>',
       'To: <sip:testuser1001@',
       'Content-Type: application/sdp',
       'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
diff --git a/scenarios/lock_ported/0013_test.yml.tt2 b/scenarios/lock_ported/0013_test.yml.tt2
index 454122d2..28be971d 100644
--- a/scenarios/lock_ported/0013_test.yml.tt2
+++ b/scenarios/lock_ported/0013_test.yml.tt2
@@ -20,7 +20,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -30,7 +30,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios/lock_ported/0015_test.yml.tt2 b/scenarios/lock_ported/0015_test.yml.tt2
index 2a179818..82a56035 100644
--- a/scenarios/lock_ported/0015_test.yml.tt2
+++ b/scenarios/lock_ported/0015_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -43,7 +43,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios/lock_ported/0016_test.yml.tt2 b/scenarios/lock_ported/0016_test.yml.tt2
index b5212e21..0c7ef06e 100644
--- a/scenarios/lock_ported/0016_test.yml.tt2
+++ b/scenarios/lock_ported/0016_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
+  - '^BYE sip:(testuser1003@)?127.0.0.1:508[0|8](;transport=udp)? SIP/2.0'
   - 'CSeq: \d+ BYE'
   - 'Content-Length: 0'
   - 'From: <sip:testuser1002@'
@@ -42,7 +42,7 @@ sip_out:
       'To: <sip:testuser1001@'
     ]
   - [
-      '^BYE sip:(testuser1003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
+      '^BYE sip:(testuser1003@)?127.0.0.1:508[0|8](;transport=udp)? SIP/2.0',
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
diff --git a/scenarios/reminder/0005_test.yml.tt2 b/scenarios/reminder/0005_test.yml.tt2
index 46742601..dd42821a 100644
--- a/scenarios/reminder/0005_test.yml.tt2
+++ b/scenarios/reminder/0005_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1001@'
   - 'To: <sip:\*55\*\d{4}@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:4311001@',
       'To: <sip:\*55\*\d{4}@'
diff --git a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
index a1dbb3d6..3f12c01d 100644
--- a/scenarios_lnp/incoming_peer/0003_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
@@ -211,7 +211,7 @@ sip_out:
       '^INVITE sip:4318881003@',
       'CSeq: \d+ INVITE',
       'From: <sip:004321001@',
-      'Contact: <sip:127.0.0.1:5080(;transport=udp)?>',
+      'Contact: <sip:127.0.0.1:508[0|8](;transport=udp)?>',
       'To: <sip:4311001@',
       'Content-Type: application/sdp',
       'P-CF-Depth: 1',
diff --git a/scenarios_lnp/incoming_peer/0010_test.yml.tt2 b/scenarios_lnp/incoming_peer/0010_test.yml.tt2
index 12e26087..8c1a4ce8 100644
--- a/scenarios_lnp/incoming_peer/0010_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0010_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:(4318881003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0'
+  - '^ACK sip:(4318881003@)?127.0.0.1:508[0|8](;transport=udp)? SIP/2.0'
   - 'CSeq: \d+ ACK'
   - 'From: <sip:004321001@'
   - 'To: <sip:4311001@'
 sip_out:
   - [
-      '^ACK sip:(4318881003@)?127.0.0.1:5080(;transport=udp)? SIP/2.0',
+      '^ACK sip:(4318881003@)?127.0.0.1:508[0|8](;transport=udp)? SIP/2.0',
       'CSeq: \d+ ACK',
       'From: <sip:004321001@',
       'To: <sip:4311001@'
diff --git a/scenarios_lnp/incoming_peer/0011_test.yml.tt2 b/scenarios_lnp/incoming_peer/0011_test.yml.tt2
index 3aa73f81..3bb93a61 100644
--- a/scenarios_lnp/incoming_peer/0011_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0011_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:004321001@'
   - 'CSeq: 2 BYE'
   - 'Max-Forwards: 69'
@@ -43,7 +43,7 @@ sip_out:
       'To: <sip:4311001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:004321001@',
       'CSeq: 2 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite/0007_test.yml.tt2 b/scenarios_lnp/invite/0007_test.yml.tt2
index b940e788..d563c6d3 100644
--- a/scenarios_lnp/invite/0007_test.yml.tt2
+++ b/scenarios_lnp/invite/0007_test.yml.tt2
@@ -24,7 +24,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -34,7 +34,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite/0008_test.yml.tt2 b/scenarios_lnp/invite/0008_test.yml.tt2
index c3b39385..cc745d0d 100644
--- a/scenarios_lnp/invite/0008_test.yml.tt2
+++ b/scenarios_lnp/invite/0008_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:4311001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_ncos_black/0015_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0015_test.yml.tt2
index eb9d5ce6..768d4b2c 100644
--- a/scenarios_lnp/invite_ncos_black/0015_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0015_test.yml.tt2
@@ -24,7 +24,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -34,7 +34,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2
index 23ddeded..6b16732f 100644
--- a/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:43999300@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_ncos_white/0007_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0007_test.yml.tt2
index f9b6e2a7..343b78a6 100644
--- a/scenarios_lnp/invite_ncos_white/0007_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0007_test.yml.tt2
@@ -24,7 +24,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -34,7 +34,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2
index 12e9f8d7..0b422dee 100644
--- a/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:43999100@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_ncos_white/0016_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0016_test.yml.tt2
index 8086bd3c..886d6899 100644
--- a/scenarios_lnp/invite_ncos_white/0016_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0016_test.yml.tt2
@@ -24,7 +24,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -34,7 +34,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
index 4052399a..336bb324 100644
--- a/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:43999200@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_peerout/0007_test.yml.tt2 b/scenarios_lnp/invite_peerout/0007_test.yml.tt2
index 45b43548..281f7469 100644
--- a/scenarios_lnp/invite_peerout/0007_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0007_test.yml.tt2
@@ -25,7 +25,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -35,7 +35,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_peerout/0008_test.yml.tt2 b/scenarios_lnp/invite_peerout/0008_test.yml.tt2
index b954a595..be2a1f23 100644
--- a/scenarios_lnp/invite_peerout/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0008_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -46,7 +46,7 @@ sip_out:
       'To: <sip:004321001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_peerout_rn/0007_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0007_test.yml.tt2
index 45b43548..281f7469 100644
--- a/scenarios_lnp/invite_peerout_rn/0007_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0007_test.yml.tt2
@@ -25,7 +25,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
@@ -35,7 +35,7 @@ sip_in:
 
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
diff --git a/scenarios_lnp/invite_peerout_rn/0008_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0008_test.yml.tt2
index e2346347..f47ee853 100644
--- a/scenarios_lnp/invite_peerout_rn/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0008_test.yml.tt2
@@ -28,7 +28,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -45,7 +45,7 @@ sip_out:
       'To: <sip:004321001@'
     ]
   - [
-      '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
index 399aa9ef..347bfa2a 100644
--- a/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0007_test.yml.tt2
@@ -200,9 +200,9 @@ sip_out:
       'P-Caller-UUID: [% spce_test.testuser1003.uuid %]',
       'P-Callee-UUID: [% spce_test.testuser1002.uuid %]',
       'P-App-Name: sbc',
-      'P-App-Param: ;a_park_domain=\d+;b_park_domain=\d+',
+      'P-App-Param: ;profile=ngcp_pbx;a_park_domain=\d+;b_park_domain=\d+',
       'P-NGCP-Acc-Src-Leg: \w+',
       'P-NGCP-Acc-Dst-Leg: \w+',
       'P-NGCP-Caller-Info: <sip:testuser1003@spce.test>;ip=127.126.0.3;port=\d+;primary=43110021003',
-      'P-NGCP-Callee-Info: <sip:4311002@spce.test>;ip=127.0.0.1;port=5085;primary=4311002',
+      'P-NGCP-Callee-Info: <sip:4311002@spce.test>;ip=127.0.0.1;port=508[5|8];primary=4311002',
     ]
diff --git a/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2
index b3c1c076..bc19a592 100644
--- a/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0009_test.yml.tt2
@@ -205,11 +205,11 @@ sip_in:
   - 'P-NGCP-Acc-Src-Leg: \w+'
   - 'P-NGCP-Acc-Dst-Leg: \w+'
   - 'P-NGCP-Caller-Info: <sip:testuser1003@spce.test>;ip=127.126.0.3;port=\d+;primary=43110021003'
-  - 'P-NGCP-Callee-Info: <sip:4311002@spce.test>;ip=127.0.0.1;port=5085;primary=4311002'
+  - 'P-NGCP-Callee-Info: <sip:4311002@spce.test>;ip=127.0.0.1;port=508[0|8];primary=4311002'
   - 'P-To-Device: 1'
   - 'Content-Type: application/sdp'
   - 'Content-Length: \d+'
-  - 'Contact: <sip:127.0.0.1:5085;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[5|8];transport=udp>'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
@@ -230,7 +230,7 @@ sip_out:
       'P-NGCP-Acc-Dst-Leg: \w+',
       'Content-Type: application/sdp',
       'Content-Length: \d+',
-      'Contact: <sip:127.0.0.1:5085;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[5|8];transport=udp>',
       'P-Caller-UUID: [% spce_test.testuser1003.uuid %]',
       'P-Callee-UUID: [% spce_test.testuser1002.uuid %]',
       'P-Asserted-Identity: <sip:43110021003@spce.test>',
@@ -253,7 +253,7 @@ sip_out:
       'P-NGCP-Acc-Dst-Leg: \w+',
       'Content-Type: application/sdp',
       'Content-Length: \d+',
-      'Contact: <sip:127.0.0.1:5085;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[5|8];transport=udp>',
       'P-Caller-UUID: [% spce_test.testuser1003.uuid %]',
       'P-Callee-UUID: [% spce_test.testuser1002.uuid %]',
       'P-Asserted-Identity: <sip:43110021003@spce.test>',
diff --git a/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2
index 6c151fe3..88913fb7 100644
--- a/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0011_test.yml.tt2
@@ -18,7 +18,7 @@ sip_in:
   - 'To: <sip:1002@spce.test>;tag='
   - 'CSeq: \d+ INVITE'
   - 'Call-Info: <sip:spce\.test>;appearance-index=1'
-  - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[0|8];transport=udp>'
   - 'Content-Length: 0'
 sip_out:
   - [
@@ -34,6 +34,6 @@ sip_out:
       'To: <sip:1002@spce.test>;tag=',
       'CSeq: \d+ INVITE',
       'Call-Info: <sip:spce.test>;appearance-index=1',
-      'Contact: <sip:127.0.0.1:5080;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[0|8];transport=udp>',
       'Content-Length: 0',
     ]
diff --git a/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2
index 801902e0..292fcfd3 100644
--- a/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0013_test.yml.tt2
@@ -18,7 +18,7 @@ sip_in:
   - 'To: <sip:1002@spce.test>;tag='
   - 'CSeq: \d+ INVITE'
   - 'Call-Info: <sip:spce\.test>;appearance-index=1'
-  - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[0|8];transport=udp>'
   - 'Content-Length: 0'
 sip_out:
   - [
@@ -34,6 +34,6 @@ sip_out:
       'To: <sip:1002@spce.test>;tag=',
       'CSeq: \d+ INVITE',
       'Call-Info: <sip:spce\.test>;appearance-index=1',
-      'Contact: <sip:127.0.0.1:5080;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[0|8];transport=udp>',
       'Content-Length: 0',
     ]
diff --git a/scenarios_pbx/incoming_shared_line/0014_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0014_test.yml.tt2
index 0d82ec3c..d6508b1d 100644
--- a/scenarios_pbx/incoming_shared_line/0014_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0014_test.yml.tt2
@@ -21,7 +21,7 @@ sip_in:
   - 'CSeq: 2 INVITE'
   - 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE'
   - 'Call-Info: <sip:spce\.test>;appearance-index=1'
-  - 'Contact: <sip:127.0.0.1:5085;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[5|8];transport=udp>'
   - 'Content-Length: 0'
 sip_out:
   - [
@@ -37,7 +37,7 @@ sip_out:
       'To: <sip:1002@spce.test>;tag=',
       'CSeq: 2 INVITE',
       'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE',
-      'Contact: <sip:127.0.0.1:5085;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[5|8];transport=udp>',
       'Content-Length: 0',
       'P-COLP-Identity: \"1002\" <sip:1002@spce.test>',
       'P-Out-Socket: udp:127.0.0.1:5060',
diff --git a/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2
index e906eb0d..cfe7b745 100644
--- a/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0015_test.yml.tt2
@@ -23,7 +23,7 @@ sip_in:
   - 'CSeq: \d+ INVITE'
   - 'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE'
   - 'Call-Info: <sip:spce\.test>;appearance-index=1'
-  - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[0|8];transport=udp>'
   - 'Content-Type: application/sdp'
   - 'Content-Length: \d+'
 sip_out:
@@ -41,7 +41,7 @@ sip_out:
       'CSeq: \d+ INVITE',
       'Allow: INVITE, PRACK, ACK, BYE, CANCEL, OPTIONS, NOTIFY, REGISTER, SUBSCRIBE, REFER, PUBLISH, UPDATE, MESSAGE',
       'Call-Info: <sip:spce\.test>;appearance-index=1',
-      'Contact: <sip:127.0.0.1:5080;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[0|8];transport=udp>',
       'Content-Type: application/sdp',
       'Content-Length: \d+',
     ]
diff --git a/scenarios_pbx/incoming_shared_line/0016_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0016_test.yml.tt2
index 6dd6a0d1..af14547f 100644
--- a/scenarios_pbx/incoming_shared_line/0016_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0016_test.yml.tt2
@@ -26,7 +26,7 @@ sip_in:
   - 'To: <sip:1002@spce.test>;tag='
   - 'CSeq: 2 INVITE'
   - 'Call-Info: <sip:spce\.test>;appearance-index=1'
-  - 'Contact: <sip:127.0.0.1:5085;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[5|8];transport=udp>'
   - 'Content-Type: application/sdp'
   - 'Content-Length: \d+'
 sip_out:
@@ -42,7 +42,7 @@ sip_out:
       'From: <sip:testuser1003@spce.test>;tag=',
       'To: <sip:1002@spce.test>;tag=',
       'CSeq: 2 INVITE',
-      'Contact: <sip:127.0.0.1:5085;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[5|8];transport=udp>',
       'Content-Type: application/sdp',
       'Content-Length: \d+',
       'P-COLP-Identity: \"1002\" <sip:1002@spce.test>',
diff --git a/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2
index 44428871..6919cfb0 100644
--- a/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0019_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];prxroute=1 SIP/2.0'
   - 'From: <sip:testuser1003@spce.test>;tag='
   - 'To: <sip:1002@spce.test>;tag='
   - 'Call-Info: <sip:spce\.test>;appearance-index=1'
@@ -64,7 +64,7 @@ sip_out:
       'Subscription-State: active;expires=\d+',
     ]
   - [
-      '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[5|8];prxroute=1 SIP/2.0',
       'From: <sip:testuser1003@spce.test>;tag=',
       'To: <sip:1002@spce.test>;tag=',
       'Call-Info: <sip:spce\.test>;appearance-index=1',
diff --git a/scenarios_pbx/incoming_shared_line/0021_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0021_test.yml.tt2
index 65961dde..0d441fe8 100644
--- a/scenarios_pbx/incoming_shared_line/0021_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0021_test.yml.tt2
@@ -31,7 +31,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5085;prxroute=1 SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[5|8];prxroute=1 SIP/2.0'
   - 'From: <sip:testuser1003@spce.test>;tag='
   - 'To: <sip:1002@spce.test>;tag='
   - 'Call-Info: <sip:spce\.test>;appearance-index=1'
@@ -87,7 +87,7 @@ sip_out:
       'Subscription-State: active;expires=\d+',
     ]
   - [
-      '^BYE sip:127.0.0.1:5085;prxroute=1 SIP/2.0',
+      '^BYE sip:127.0.0.1:508[5|8];prxroute=1 SIP/2.0',
       'From: <sip:testuser1003@spce.test>;tag=',
       'To: <sip:1002@spce.test>;tag=',
       'CSeq: 3 BYE',
diff --git a/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2 b/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2
index b125ed00..eb1b7113 100644
--- a/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2
+++ b/scenarios_pbx/incoming_shared_line/0022_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0'
   - 'From: <sip:testuser1003@spce.test>;tag='
   - 'To: <sip:1002@spce.test>;tag='
   - 'CSeq: \d+ BYE'
@@ -51,7 +51,7 @@ sip_out:
       'Content-Type: application/dialog-info\+xml',
     ]
   - [
-      '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0',
       'From: <sip:43110021003@spce.test>;tag=',
       'To: <sip:1002@spce.test>;tag=',
       'CSeq: \d+ BYE',
diff --git a/scenarios_pbx/invite/0005_test.yml.tt2 b/scenarios_pbx/invite/0005_test.yml.tt2
index 14dd2878..4a56d66d 100644
--- a/scenarios_pbx/invite/0005_test.yml.tt2
+++ b/scenarios_pbx/invite/0005_test.yml.tt2
@@ -192,6 +192,6 @@ sip_out:
       'P-NGCP-Lookup-Type: ext',
       'P-NGCP-Orig-User: 43110021003',
       'P-NGCP-Orig-Dialed: 1003',
-      'P-App-Param: (;calltimer=21600)?;a_park_domain=\d+;b_park_domain=\d+',
+      'P-App-Param: (;calltimer=21600)?;profile=ngcp_pbx;a_park_domain=\d+;b_park_domain=\d+',
       'P-App-Name: sbc'
     ]
diff --git a/scenarios_pbx/invite/0007_test.yml.tt2 b/scenarios_pbx/invite/0007_test.yml.tt2
index 7f510aba..56cbd2c3 100644
--- a/scenarios_pbx/invite/0007_test.yml.tt2
+++ b/scenarios_pbx/invite/0007_test.yml.tt2
@@ -160,14 +160,14 @@ sip_in:
   - 'P-Caller-UUID: [% spce_test.testuser1002.uuid %]'
   - 'P-Callee-UUID: [% spce_test.testuser1003.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:testuser1002@'
-  - 'P-NGCP-Callee-Info: <sip:43110021003@spce.test>;ip=127.0.0.1;port=5085;'
+  - 'P-NGCP-Callee-Info: <sip:43110021003@spce.test>;ip=127.0.0.1;port=508[5|8];'
   - 'P-To-Device: 1'
   - 'Content-Type: application/sdp'
-  - 'Contact: <sip:127.0.0.1:5085;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[5|8];transport=udp>'
 sip_out:
   - [
       'SIP/2.0 100 Trying',
-      'Via: SIP/2.0/UDP 127.0.0.1:5085;branch=',
+      'Via: SIP/2.0/UDP 127.0.0.1:508[5|8];branch=',
       'From: <sip:testuser1002@',
       'To: <sip:1003@',
       'CSeq: \d+ INVITE',
@@ -180,7 +180,7 @@ sip_out:
        'CSeq: \d+ INVITE',
        'Max-Forwards: 69',
        'Content-Type: application/sdp',
-       'Contact: <sip:127.0.0.1:5085;transport=udp>',
+       'Contact: <sip:127.0.0.1:508[5|8];transport=udp>',
        'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
        'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
        'P-Asserted-Identity: <sip:4311002@',
diff --git a/scenarios_pbx/invite/0013_test.yml.tt2 b/scenarios_pbx/invite/0013_test.yml.tt2
index 58c0464e..f2605e63 100644
--- a/scenarios_pbx/invite/0013_test.yml.tt2
+++ b/scenarios_pbx/invite/0013_test.yml.tt2
@@ -26,13 +26,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[5|8];prxroute=1 SIP/2.0'
   - 'CSeq: 2 ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5085;prxroute=1 SIP/2.0',
+      '^ACK sip:127.0.0.1:508[5|8];prxroute=1 SIP/2.0',
       'CSeq: 2 ACK',
       'From: <sip:testuser1002@',
       'To: <sip:1003@'
diff --git a/scenarios_pbx/invite/0014_test.yml.tt2 b/scenarios_pbx/invite/0014_test.yml.tt2
index 58f14ca7..d2029df1 100644
--- a/scenarios_pbx/invite/0014_test.yml.tt2
+++ b/scenarios_pbx/invite/0014_test.yml.tt2
@@ -24,13 +24,13 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];transport=udp SIP/2.0'
   - 'CSeq: \d+ ACK'
   - 'From: <sip:testuser1002@'
   - 'To: <sip:1003@'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];transport=udp SIP/2.0',
       'CSeq: \d+ ACK',
       'From: <sip:4311002@',
       'To: <sip:1003@'
diff --git a/scenarios_pbx/invite/0015_test.yml.tt2 b/scenarios_pbx/invite/0015_test.yml.tt2
index bebe9c00..e3b26b85 100644
--- a/scenarios_pbx/invite/0015_test.yml.tt2
+++ b/scenarios_pbx/invite/0015_test.yml.tt2
@@ -32,7 +32,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5085(;prxroute=1)? SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[5|8](;prxroute=1)? SIP/2.0'
   - 'Contact: sip:testuser1002@'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
@@ -56,7 +56,7 @@ sip_out:
       'Content-Type: application/dialog-info\+xml',
     ]
   - [
-      '^BYE sip:127.0.0.1:5085(;prxroute=1)? SIP/2.0',
+      '^BYE sip:127.0.0.1:508[5|8](;prxroute=1)? SIP/2.0',
       'Contact: sip:testuser1002@',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
diff --git a/scenarios_pbx/invite/0016_test.yml.tt2 b/scenarios_pbx/invite/0016_test.yml.tt2
index e473d929..3034d417 100644
--- a/scenarios_pbx/invite/0016_test.yml.tt2
+++ b/scenarios_pbx/invite/0016_test.yml.tt2
@@ -30,7 +30,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0'
   - 'CSeq: \d+ BYE'
   - 'Max-Forwards: 70'
   - 'Content-Length: 0'
@@ -53,7 +53,7 @@ sip_out:
       'Content-Type: application/dialog-info\+xml',
     ]
   - [
-      '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0',
       'CSeq: \d+ BYE',
       'Max-Forwards: 69',
       'Content-Length: 0',
diff --git a/scenarios_pbx/invite_shared_line/0005_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0005_test.yml.tt2
index 306b59ed..4e7c95ab 100644
--- a/scenarios_pbx/invite_shared_line/0005_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0005_test.yml.tt2
@@ -229,9 +229,9 @@ sip_out:
       'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
       'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
       'P-App-Name: sbc',
-      'P-App-Param: ;a_park_domain=\d+;b_park_domain=\d+',
+      'P-App-Param: ;profile=ngcp_pbx;a_park_domain=\d+;b_park_domain=\d+',
       'P-NGCP-Acc-Src-Leg: \w+',
       'P-NGCP-Acc-Dst-Leg: \w+',
       'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002',
-      'P-NGCP-Callee-Info: <sip:43110021003@spce.test>;ip=127.0.0.1;port=5085;primary=43110021003',
+      'P-NGCP-Callee-Info: <sip:43110021003@spce.test>;ip=127.0.0.1;port=508[5|8];primary=43110021003',
     ]
diff --git a/scenarios_pbx/invite_shared_line/0007_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0007_test.yml.tt2
index 62e1180d..270e9117 100644
--- a/scenarios_pbx/invite_shared_line/0007_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0007_test.yml.tt2
@@ -167,10 +167,10 @@ sip_in:
   - 'P-NGCP-Acc-Src-Leg: \w+'
   - 'P-NGCP-Acc-Dst-Leg: \w+'
   - 'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002'
-  - 'P-NGCP-Callee-Info: <sip:43110021003@spce.test>;ip=127.0.0.1;port=5085;primary=43110021003'
+  - 'P-NGCP-Callee-Info: <sip:43110021003@spce.test>;ip=127.0.0.1;port=508[5|8];primary=43110021003'
   - 'P-To-Device: 1'
   - 'Content-Type: application/sdp'
-  - 'Contact: <sip:127.0.0.1:5085;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[5|8];transport=udp>'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
@@ -186,7 +186,7 @@ sip_out:
       'P-NGCP-Acc-Src-Leg: \w+',
       'P-NGCP-Acc-Dst-Leg: \w+',
       'Content-Type: application/sdp',
-      'Contact: <sip:127.0.0.1:5085;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[5|8];transport=udp>',
       'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
       'P-Callee-UUID: [% spce_test.testuser1003.uuid %]',
       'P-Asserted-Identity: <sip:4311002@spce.test>',
diff --git a/scenarios_pbx/invite_shared_line/0009_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0009_test.yml.tt2
index 4ba2d6ff..04d4e282 100644
--- a/scenarios_pbx/invite_shared_line/0009_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0009_test.yml.tt2
@@ -14,7 +14,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
-  - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[0|8];transport=udp>'
   - 'Content-Length:\s+0'
 sip_out:
   - [
@@ -29,6 +29,6 @@ sip_out:
       'From: <sip:testuser1002@spce.test>;tag=',
       'To: <sip:1003@spce.test>;tag=',
       'CSeq: \d+ INVITE',
-      'Contact: <sip:127.0.0.1:5080;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[0|8];transport=udp>',
       'Content-Length:\s+0'
     ]
diff --git a/scenarios_pbx/invite_shared_line/0010_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0010_test.yml.tt2
index 554020a0..65615fd5 100644
--- a/scenarios_pbx/invite_shared_line/0010_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0010_test.yml.tt2
@@ -25,7 +25,7 @@ sip_in:
   - 'From: <sip:4311002@spce.test>;tag='
   - 'To: <sip:1003@spce.test>;tag='
   - 'CSeq: \d+ INVITE'
-  - 'Contact: <sip:127.0.0.1:5080;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[0|8];transport=udp>'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
@@ -40,6 +40,6 @@ sip_out:
       'From: <sip:testuser1002@spce.test>;tag=',
       'To: <sip:1003@spce.test>;tag=',
       'CSeq: \d+ INVITE',
-      'Contact: <sip:127.0.0.1:5080;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[0|8];transport=udp>',
       'Content-Type: application/sdp'
     ]
diff --git a/scenarios_pbx/invite_shared_line/0011_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0011_test.yml.tt2
index 2c01609d..62543446 100644
--- a/scenarios_pbx/invite_shared_line/0011_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0011_test.yml.tt2
@@ -19,7 +19,7 @@ sip_in:
   - 'From: <sip:testuser1002@spce.test>;tag='
   - 'To: <sip:1003@spce.test>;tag='
   - 'CSeq: 2 INVITE'
-  - 'Contact: <sip:127.0.0.1:5085;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[5|8];transport=udp>'
 sip_out:
   - [
       '^NOTIFY sip:testuser1002@127.1.0.2:\d+ SIP/2.0',
@@ -53,7 +53,7 @@ sip_out:
       'From: <sip:testuser1002@spce.test>;tag=',
       'To: <sip:1003@spce.test>;tag=',
       'CSeq: 2 INVITE',
-      'Contact: <sip:127.0.0.1:5085;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[5|8];transport=udp>',
       'Content-Length:\s+0',
       'P-COLP-Identity: \"1003\" <sip:1003@spce.test>',
       'P-Out-Socket: udp:127.0.0.1:5060'
diff --git a/scenarios_pbx/invite_shared_line/0012_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0012_test.yml.tt2
index 38365948..6596578d 100644
--- a/scenarios_pbx/invite_shared_line/0012_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0012_test.yml.tt2
@@ -34,7 +34,7 @@ sip_in:
   - 'From: <sip:testuser1002@spce.test>;tag='
   - 'To: <sip:1003@spce.test>;tag='
   - 'CSeq: 2 INVITE'
-  - 'Contact: <sip:127.0.0.1:5085;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[5|8];transport=udp>'
   - 'Content-Type: application/sdp'
 sip_out:
   - [
@@ -59,7 +59,7 @@ sip_out:
       'From: <sip:testuser1002@spce.test>;tag=',
       'To: <sip:1003@spce.test>;tag=',
       'CSeq: 2 INVITE',
-      'Contact: <sip:127.0.0.1:5085;transport=udp>',
+      'Contact: <sip:127.0.0.1:508[5|8];transport=udp>',
       'Content-Type: application/sdp',
       'P-COLP-Identity: \"1003\" <sip:1003@spce.test>',
       'P-Asserted-Identity:  <sip:testuser1003@spce.test>',
diff --git a/scenarios_pbx/invite_shared_line/0013_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0013_test.yml.tt2
index f644ff8f..0eef9329 100644
--- a/scenarios_pbx/invite_shared_line/0013_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0013_test.yml.tt2
@@ -26,7 +26,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5085(;prxroute=1)? SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[5|8](;prxroute=1)? SIP/2.0'
   - 'From: <sip:testuser1002@spce.test>;tag='
   - 'To: <sip:1003@spce.test>;tag='
   - 'Call-Info: <sip:spce.test>;appearance-index=1'
@@ -40,7 +40,7 @@ sip_in:
   - 'P-Sock-Info: udp:127.0.0.1:5060'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5085(;prxroute=1)? SIP/2.0',
+      '^ACK sip:127.0.0.1:508[5|8](;prxroute=1)? SIP/2.0',
       'From: <sip:testuser1002@spce.test>;tag=',
       'To: <sip:1003@spce.test>;tag=',
       'Call-Info: <sip:spce.test>;appearance-index=1',
diff --git a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2
index 843f9c8a..155ffe0e 100644
--- a/scenarios_pbx/invite_shared_line/0014_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0014_test.yml.tt2
@@ -24,19 +24,19 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0'
+  - '^ACK sip:127.0.0.1:508[0|8];transport=udp SIP/2.0'
   - 'From: <sip:testuser1002@spce.test>;tag='
   - 'To: <sip:1003@spce.test>;tag='
   - 'CSeq: \d+ ACK'
   - 'Max-Forwards: 70'
   - 'Content-Length:\s+0'
-  - 'Contact: <sip:127.0.0.1:5085;transport=udp>'
+  - 'Contact: <sip:127.0.0.1:508[5|8];transport=udp>'
 sip_out:
   - [
-      '^ACK sip:127.0.0.1:5080;transport=udp SIP/2.0',
+      '^ACK sip:127.0.0.1:508[0|8];transport=udp SIP/2.0',
       'From: <sip:4311002@spce.test>;tag=',
       'To: <sip:1003@spce.test>;tag=',
       'CSeq: \d+ ACK',
       'Content-Length:\s+0',
-      'Contact: <sip:127.0.0.1:5085;transport=udp>'
+      'Contact: <sip:127.0.0.1:508[5|8];transport=udp>'
     ]
diff --git a/scenarios_pbx/invite_shared_line/0015_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0015_test.yml.tt2
index bfb2ead4..3074621f 100644
--- a/scenarios_pbx/invite_shared_line/0015_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0015_test.yml.tt2
@@ -32,7 +32,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5085;prxroute=1 SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[5|8];prxroute=1 SIP/2.0'
   - 'From: <sip:testuser1002@spce.test>;tag='
   - 'To: <sip:1003@spce.test>;tag='
   - 'Call-Info: <sip:spce.test>;appearance-index=1'
@@ -74,7 +74,7 @@ sip_out:
       'Subscription-State: active;expires=\d+'
     ]
   - [
-      '^BYE sip:127.0.0.1:5085;prxroute=1 SIP/2.0',
+      '^BYE sip:127.0.0.1:508[5|8];prxroute=1 SIP/2.0',
       'From: <sip:testuser1002@spce.test>;tag=',
       'To: <sip:1003@spce.test>;tag=',
       'CSeq: 3 BYE',
diff --git a/scenarios_pbx/invite_shared_line/0016_test.yml.tt2 b/scenarios_pbx/invite_shared_line/0016_test.yml.tt2
index 518f25ba..6cc2fcaf 100644
--- a/scenarios_pbx/invite_shared_line/0016_test.yml.tt2
+++ b/scenarios_pbx/invite_shared_line/0016_test.yml.tt2
@@ -30,7 +30,7 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0'
+  - '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0'
   - 'From: <sip:testuser1002@spce.test>;tag='
   - 'To: <sip:1003@spce.test>;tag='
   - 'CSeq: \d+ BYE'
@@ -51,7 +51,7 @@ sip_out:
       'Content-Type: application/dialog-info\+xml',
     ]
   - [
-      '^BYE sip:127.0.0.1:5080;transport=udp SIP/2.0',
+      '^BYE sip:127.0.0.1:508[0|8];transport=udp SIP/2.0',
       'From: <sip:4311002@spce.test>;tag=',
       'To: <sip:1003@spce.test>;tag=',
       'CSeq: \d+ BYE',