diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2
index 8dc61488..d864eb78 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0001_test.yml.tt2
@@ -21,9 +21,9 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
-  - 'To: <sip:[% scenarios.0.responders.0.username %]@'
+  - '^INVITE sip:[% scenarios.0.responders.0.username %]@invite-peerout-rewrite-pv-regex.scenarios.test'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
+  - 'To: <sip:[% scenarios.0.responders.0.username %]@invite-peerout-rewrite-pv-regex.scenarios.test>'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
index 59f45974..7588e31a 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0003_test.yml.tt2
@@ -56,7 +56,7 @@ flow:
   - start|ROUTE_FIND_CALLEE:
   - start|ROUTE_APPLY_REWRITE_RULE:
   - return|ROUTE_APPLY_REWRITE_RULE:
-      $var(dp_user): 4321001
+      $var(dp_user): [% extra_info.phone_numbers.0 %]
   - start|ROUTE_CLEAR_CALLEE_PREF:
   - return|ROUTE_CLEAR_CALLEE_PREF:
   - start|ROUTE_NCOS_CHECK:
@@ -203,8 +203,8 @@ flow:
         "outgoing"
       ]
 sip_in:
-  - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - '^INVITE sip:[% scenarios.0.responders.0.username %]@invite-peerout-rewrite-pv-regex.scenarios.test'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -223,15 +223,15 @@ sip_out:
       'To: <sip:[% scenarios.0.responders.0.username %]@'
     ]
   - [
-      '^INVITE sip:4321001@',
+      '^INVITE sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]',
       'CSeq: 2 INVITE',
       'From: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@',
       'To: <sip:[% scenarios.0.responders.0.username %]@',
       'Content-Type: application/sdp',
       'P-Caller-UUID: [% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.uuid %]',
       'P-Callee-UUID: 0',
-      'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@',
-      'P-Called-Party-ID: <sip:4321001@',
+      'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>',
+      'P-Called-Party-ID: <sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]>',
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc'
     ]
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0004_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0004_test.yml.tt2
index a486d1c7..e9127f2e 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/0004_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0004_test.yml.tt2
@@ -13,15 +13,15 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:4321001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
+  - 'INVITE sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'From: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+'
-  - 'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>'
+  - 'To: <sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
   - 'P-LB-Uptime: \d+'
   - 'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>'
   - 'P-Caller-UUID: [% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-peerout-rewrite-pv-regex.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:4321001@invite-peerout-rewrite-pv-regex.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]'
+  - 'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@invite-peerout-rewrite-pv-regex.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]'
   - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
@@ -30,21 +30,21 @@ sip_out:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+',
-      'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>',
+      'To: <sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:4321001@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0',
+      'INVITE sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0',
       'From: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>;tag=[\w-]+',
-      'To: <sip:4321001@[% scenarios.0.responders.0.ip %]>',
+      'To: <sip:[% extra_info.phone_numbers.0 %]@[% scenarios.0.responders.0.ip %]>',
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
       'P-Asserted-Identity: <sip:[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.sn %]@invite-peerout-rewrite-pv-regex.scenarios.test>',
       'P-Caller-UUID: [% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.uuid %]',
       'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-peerout-rewrite-pv-regex.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_rewrite_pv_regex_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:4321001@invite-peerout-rewrite-pv-regex.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]',
+      'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@invite-peerout-rewrite-pv-regex.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]',
       'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0011_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0011_test.yml.tt2
index a784b3ab..4ba6f1b8 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/0011_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0011_test.yml.tt2
@@ -25,7 +25,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -35,7 +35,7 @@ sip_in:
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/0013_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/0013_test.yml.tt2
index b553a15d..833ba20e 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/0013_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/0013_test.yml.tt2
@@ -29,7 +29,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -46,7 +46,7 @@ sip_out:
     ]
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/cdr_test.yml.tt2 b/scenarios/invite_peerout_rewrite_pv_regex/cdr_test.yml.tt2
index 175752e9..19941b04 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/cdr_test.yml.tt2
+++ b/scenarios/invite_peerout_rewrite_pv_regex/cdr_test.yml.tt2
@@ -3,9 +3,9 @@ cdr:
     source_domain: 'invite-peerout-rewrite-pv-regex.scenarios.test'
     source_cli: ''
     source_user_out: ''
-    destination_user: '4321001'
+    destination_user: '[% extra_info.phone_numbers.0 %]'
     destination_domain: '[% scenarios.0.responders.0.ip %]'
-    destination_user_dialed: '4321001'
+    destination_user_dialed: '[% extra_info.phone_numbers.0 %]'
     call_type: 'call'
     call_status: 'ok'
     call_code: '200'
\ No newline at end of file
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/scenario.yml b/scenarios/invite_peerout_rewrite_pv_regex/scenario.yml
index b65eda25..faed19cc 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/scenario.yml
+++ b/scenarios/invite_peerout_rewrite_pv_regex/scenario.yml
@@ -43,3 +43,6 @@ scenarios:
         domain: invite-peerout-rewrite-pv-regex.scenarios.test
         peer_host: peer_invite_peerout_rewrite_pv_regex_host0
         register: 'no'
+extra_info:
+  phone_numbers:
+    - 4321001