diff --git a/scenarios/invite_peerout_failover/0001_test.yml.tt2 b/scenarios/invite_peerout_failover/0001_test.yml.tt2
index aab6ff9c..29c12be5 100644
--- a/scenarios/invite_peerout_failover/0001_test.yml.tt2
+++ b/scenarios/invite_peerout_failover/0001_test.yml.tt2
@@ -22,7 +22,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'To: <sip:[% scenarios.0.responders.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
diff --git a/scenarios/invite_peerout_failover/0003_test.yml.tt2 b/scenarios/invite_peerout_failover/0003_test.yml.tt2
index 8add26cf..ce05e40f 100644
--- a/scenarios/invite_peerout_failover/0003_test.yml.tt2
+++ b/scenarios/invite_peerout_failover/0003_test.yml.tt2
@@ -181,7 +181,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:[% scenarios.0.responders.0.username %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios/invite_peerout_failover/0009_test.yml.tt2 b/scenarios/invite_peerout_failover/0009_test.yml.tt2
index 82ca6526..10577bbe 100644
--- a/scenarios/invite_peerout_failover/0009_test.yml.tt2
+++ b/scenarios/invite_peerout_failover/0009_test.yml.tt2
@@ -161,26 +161,26 @@ flow:
   - '^SIP/2.0 408 Timeout'
 "sip_out":
   - [
-      '^ACK sip:004321001@[% scenarios.0.responders.0.ip %]:\d+;transport=udp SIP/2.0',
+      '^ACK sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:\d+;transport=udp SIP/2.0',
       'From: <sip:[% invite_peerout_failover_scenarios_test.testuser1002.phone_number %]@invite-peerout-failover.scenarios.test>;tag=',
-      'To: <sip:004321001@invite-peerout-failover.scenarios.test>;tag=',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-peerout-failover.scenarios.test>;tag=',
       'CSeq: 2 ACK',
       'Content-Length: 0'
     ]
   - [
-      '^INVITE sip:004321001@[% scenarios.0.responders.0.ip %]:\d+;transport=udp SIP/2.0',
+      '^INVITE sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]:\d+;transport=udp SIP/2.0',
       'From: <sip:[% invite_peerout_failover_scenarios_test.testuser1002.phone_number %]@invite-peerout-failover.scenarios.test>;tag=',
-      'To: <sip:004321001@invite-peerout-failover.scenarios.test>',
+      'To: <sip:[% scenarios.0.responders.0.username %]@invite-peerout-failover.scenarios.test>',
       'CSeq: 2 INVITE',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Type: application/sdp',
       'P-Caller-UUID: [% invite_peerout_failover_scenarios_test.testuser1002.uuid %]',
       'P-Callee-UUID: [% invite_peerout_failover_scenarios_test.testuser1001.uuid %]',
       'P-Asserted-Identity: <sip:[% invite_peerout_failover_scenarios_test.testuser1002.phone_number %]@invite-peerout-failover.scenarios.test>',
-      'P-Called-Party-ID: <sip:004321001@[% scenarios.0.responders.0.ip %]>',
+      'P-Called-Party-ID: <sip:[% scenarios.0.responders.0.username %]@[% scenarios.0.responders.0.ip %]>',
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
       'P-App-Name: sbc',
       'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-peerout-failover.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_failover_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:004321001@invite-peerout-failover.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=\d+',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-peerout-failover.scenarios.test>;ip=[% scenarios.0.responders.2.ip %];port=[% scenarios.0.responders.2.port %]',
       'P-D-Uri: sip:127.0.0.1:5060;received=',
     ]
diff --git a/scenarios/invite_peerout_failover/0017_test.yml.tt2 b/scenarios/invite_peerout_failover/0017_test.yml.tt2
index 209fd3f4..55fb6f1b 100644
--- a/scenarios/invite_peerout_failover/0017_test.yml.tt2
+++ b/scenarios/invite_peerout_failover/0017_test.yml.tt2
@@ -26,7 +26,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'
@@ -36,7 +36,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_failover/0019_test.yml.tt2 b/scenarios/invite_peerout_failover/0019_test.yml.tt2
index bd0139ee..7acff0a1 100644
--- a/scenarios/invite_peerout_failover/0019_test.yml.tt2
+++ b/scenarios/invite_peerout_failover/0019_test.yml.tt2
@@ -30,7 +30,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'
@@ -47,7 +47,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_failover/sipp_scenario00.xml b/scenarios/invite_peerout_failover/sipp_scenario00.xml
index 750a70e4..b5921982 100644
--- a/scenarios/invite_peerout_failover/sipp_scenario00.xml
+++ b/scenarios/invite_peerout_failover/sipp_scenario00.xml
@@ -10,7 +10,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -41,7 +41,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -59,7 +59,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Max-Forwards: 70
       [field1 file="caller.csv" line=0]
       Content-Type: application/sdp
@@ -99,7 +99,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -124,7 +124,7 @@
       To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 3 BYE
-      Contact: sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=0]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0