diff --git a/scenarios/invite_stir/0005_test.yml.tt2 b/scenarios/invite_stir/0005_test.yml.tt2
index 3f696341..83287ae4 100644
--- a/scenarios/invite_stir/0005_test.yml.tt2
+++ b/scenarios/invite_stir/0005_test.yml.tt2
@@ -22,7 +22,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - '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_stir/0007_test.yml.tt2 b/scenarios/invite_stir/0007_test.yml.tt2
index 741094fb..f428b2fa 100644
--- a/scenarios/invite_stir/0007_test.yml.tt2
+++ b/scenarios/invite_stir/0007_test.yml.tt2
@@ -215,7 +215,7 @@ flow:
       ]
 sip_in:
   - '^INVITE'
-  - '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_stir/0009_test.yml.tt2 b/scenarios/invite_stir/0009_test.yml.tt2
index 5ba60c80..e6db675b 100644
--- a/scenarios/invite_stir/0009_test.yml.tt2
+++ b/scenarios/invite_stir/0009_test.yml.tt2
@@ -21,8 +21,8 @@ sip_in:
   - 'P-Asserted-Identity: <sip:[% invite_stir_scenarios_test.testuser1002.phone_number %]@invite-stir.scenarios.test>;verstat=TN-Validation-Passed-A'
   - 'P-Caller-UUID: [% invite_stir_scenarios_test.testuser1002.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-stir.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_stir_scenarios_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-stir.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_stir_scenarios_test.testuser1003.phone_number %]'
-  - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-stir.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_stir_scenarios_test.testuser1003.phone_number %]'
+  - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length:\s+\d+'
@@ -44,8 +44,8 @@ sip_out:
       'P-Asserted-Identity: <sip:[% invite_stir_scenarios_test.testuser1002.phone_number %]@invite-stir.scenarios.test>;verstat=TN-Validation-Passed-A',
       'P-Caller-UUID: [% invite_stir_scenarios_test.testuser1002.uuid %]',
       'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-stir.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_stir_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-stir.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_stir_scenarios_test.testuser1003.phone_number %]',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-stir.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_stir_scenarios_test.testuser1003.phone_number %]',
+      'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];)?socket=sip:[% server_ip %]:5060',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length:\s+\d+',
diff --git a/scenarios/invite_stir/0017_test.yml.tt2 b/scenarios/invite_stir/0017_test.yml.tt2
index a8d926e1..1f1636c7 100644
--- a/scenarios/invite_stir/0017_test.yml.tt2
+++ b/scenarios/invite_stir/0017_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_stir/0021_test.yml.tt2 b/scenarios/invite_stir/0021_test.yml.tt2
index 0da1a144..9ee6628e 100644
--- a/scenarios/invite_stir/0021_test.yml.tt2
+++ b/scenarios/invite_stir/0021_test.yml.tt2
@@ -22,7 +22,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:[% scenarios.1.username %]@'
+  - 'Contact: <sip:[% scenarios.1.username %]@[% scenarios.1.ip %]:[% scenarios.1.port %](;[^>]+)?>'
   - 'To: <sip:[% scenarios.1.responders.0.username %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
diff --git a/scenarios/invite_stir/0023_test.yml.tt2 b/scenarios/invite_stir/0023_test.yml.tt2
index 7a3bbb38..54af8e93 100644
--- a/scenarios/invite_stir/0023_test.yml.tt2
+++ b/scenarios/invite_stir/0023_test.yml.tt2
@@ -211,7 +211,7 @@ flow:
       ]
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:[% scenarios.1.username %]@'
+  - 'Contact: <sip:[% scenarios.1.username %]@[% scenarios.1.ip %]:[% scenarios.1.port %](;[^>]+)?>'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios/invite_stir/0025_test.yml.tt2 b/scenarios/invite_stir/0025_test.yml.tt2
index 0c631c02..c57876ee 100644
--- a/scenarios/invite_stir/0025_test.yml.tt2
+++ b/scenarios/invite_stir/0025_test.yml.tt2
@@ -21,8 +21,8 @@ sip_in:
   - 'P-Asserted-Identity: <sip:[% invite_stir_scenarios_test.testuser1002.phone_number %]@invite-stir.scenarios.test>\r\n'
   - 'P-Caller-UUID: [% invite_stir_scenarios_test.testuser1002.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:[% scenarios.1.username %]@invite-stir.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.1.port %];primary=[% invite_stir_scenarios_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:[% scenarios.1.responders.0.username %]@invite-stir.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_stir_scenarios_test.testuser1004.phone_number %]'
-  - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.1.responders.0.username %]@invite-stir.scenarios.test>;ip=[% scenarios.1.responders.0.ip %];port=[% scenarios.1.responders.0.port %];primary=[% invite_stir_scenarios_test.testuser1004.phone_number %]'
+  - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.1.responders.0.ip %]:[% scenarios.1.responders.0.port %];)?socket=sip:[% server_ip %]:5060'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length:\s+\d+'
@@ -44,8 +44,8 @@ sip_out:
       'P-Asserted-Identity: <sip:[% invite_stir_scenarios_test.testuser1002.phone_number %]@invite-stir.scenarios.test>\r\n',
       'P-Caller-UUID: [% invite_stir_scenarios_test.testuser1002.uuid %]',
       'P-NGCP-Caller-Info: <sip:[% scenarios.1.username %]@invite-stir.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.1.port %];primary=[% invite_stir_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% scenarios.1.responders.0.username %]@invite-stir.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_stir_scenarios_test.testuser1004.phone_number %]',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.1.responders.0.username %]@invite-stir.scenarios.test>;ip=[% scenarios.1.responders.0.ip %];port=[% scenarios.1.responders.0.port %];primary=[% invite_stir_scenarios_test.testuser1004.phone_number %]',
+      'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.1.responders.0.ip %]:[% scenarios.1.responders.0.port %];)?socket=sip:[% server_ip %]:5060',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length:\s+\d+',
diff --git a/scenarios/invite_stir/0033_test.yml.tt2 b/scenarios/invite_stir/0033_test.yml.tt2
index fb3bb8a9..de80f3a1 100644
--- a/scenarios/invite_stir/0033_test.yml.tt2
+++ b/scenarios/invite_stir/0033_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.1.username %]@'
+  - 'Contact: <sip:[% scenarios.1.username %]@[% scenarios.1.ip %]:[% scenarios.1.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.1.username %]@',
+      'Contact: <sip:[% scenarios.1.username %]@[% scenarios.1.ip %]:[% scenarios.1.port %](;[^>]+)?>',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios/invite_stir/sipp_scenario00.xml b/scenarios/invite_stir/sipp_scenario00.xml
index 2c74d2e8..82352fd5 100644
--- a/scenarios/invite_stir/sipp_scenario00.xml
+++ b/scenarios/invite_stir/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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -39,7 +39,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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -57,7 +57,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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       [field1 file="caller.csv"]
       Content-Type: application/sdp
@@ -90,7 +90,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -115,7 +115,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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite_stir/sipp_scenario01.xml b/scenarios/invite_stir/sipp_scenario01.xml
index 272b5116..7bd31944 100644
--- a/scenarios/invite_stir/sipp_scenario01.xml
+++ b/scenarios/invite_stir/sipp_scenario01.xml
@@ -10,7 +10,7 @@
       To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
       Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id]
       CSeq: 1 INVITE
-      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -39,7 +39,7 @@
       To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -57,7 +57,7 @@
       To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>
       Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id]
       CSeq: 2 INVITE
-      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]>
       Max-Forwards: 70
       [field1 file="caller.csv" line=1]
       Content-Type: application/sdp
@@ -90,7 +90,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id]
       [routes]
       CSeq: 2 ACK
-      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -115,7 +115,7 @@
       To: <sip:[field0 file="callee.csv" line=1]@[field3 file="callee.csv" line=1]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id]
       CSeq: 3 BYE
-      Contact: sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=1]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0