diff --git a/scenarios/incoming_peer_stir/0003_test.yml.tt2 b/scenarios/incoming_peer_stir/0003_test.yml.tt2
index 90a1c3db..eefe0a68 100644
--- a/scenarios/incoming_peer_stir/0003_test.yml.tt2
+++ b/scenarios/incoming_peer_stir/0003_test.yml.tt2
@@ -184,7 +184,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -202,7 +202,7 @@ sip_out:
       'CSeq: 1 INVITE',
       'From: <sip:[% scenarios.0.username %]@',
       'To: <sip:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Type: application/sdp',
       'Identity: [^;]+;info=<http://fake.url/pub.key>;alg=ES256;ppt=shaken',
       'P-Caller-UUID: 0',
diff --git a/scenarios/incoming_peer_stir/0005_test.yml.tt2 b/scenarios/incoming_peer_stir/0005_test.yml.tt2
index 6db17d68..eb6d1d5b 100644
--- a/scenarios/incoming_peer_stir/0005_test.yml.tt2
+++ b/scenarios/incoming_peer_stir/0005_test.yml.tt2
@@ -21,8 +21,8 @@ sip_in:
   - 'P-Asserted-Identity: <sip:[% scenarios.0.username %]@incoming-peer-stir.scenarios.test>;verstat=TN-Validation-Passed'
   - 'P-Caller-UUID: 0'
   - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]'
-  - 'P-NGCP-Callee-Info: <sip:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@incoming-peer-stir.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% incoming_peer_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:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@incoming-peer-stir.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% incoming_peer_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:[% scenarios.0.username %]@incoming-peer-stir.scenarios.test>;verstat=TN-Validation-Passed',
       'P-Caller-UUID: 0',
       'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]',
-      'P-NGCP-Callee-Info: <sip:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@incoming-peer-stir.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% incoming_peer_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:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@incoming-peer-stir.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% incoming_peer_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/incoming_peer_stir/0013_test.yml.tt2 b/scenarios/incoming_peer_stir/0013_test.yml.tt2
index 59eb6439..febfe5cd 100644
--- a/scenarios/incoming_peer_stir/0013_test.yml.tt2
+++ b/scenarios/incoming_peer_stir/0013_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: 2 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: 2 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios/incoming_peer_stir/0017_test.yml.tt2 b/scenarios/incoming_peer_stir/0017_test.yml.tt2
index 16fc5aec..c3077466 100644
--- a/scenarios/incoming_peer_stir/0017_test.yml.tt2
+++ b/scenarios/incoming_peer_stir/0017_test.yml.tt2
@@ -93,7 +93,7 @@ flow:
       $avp(lua_dlg_profile): None
 sip_in:
   - '^INVITE sip:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@'
-  - 'Contact: sip:[% scenarios.1.username %]@'
+  - 'Contact: <sip:[% scenarios.1.username %]@[% scenarios.1.ip %]:[% scenarios.1.port %](;[^>]+)?>'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios/incoming_peer_stir/0019_test.yml.tt2 b/scenarios/incoming_peer_stir/0019_test.yml.tt2
index afe757b3..11d54307 100644
--- a/scenarios/incoming_peer_stir/0019_test.yml.tt2
+++ b/scenarios/incoming_peer_stir/0019_test.yml.tt2
@@ -93,7 +93,7 @@ flow:
       $avp(lua_dlg_profile): None
 sip_in:
   - '^INVITE sip:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@'
-  - 'Contact: sip:[% scenarios.2.username %]@'
+  - 'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios/incoming_peer_stir/0021_test.yml.tt2 b/scenarios/incoming_peer_stir/0021_test.yml.tt2
index fc9a042b..49eb1702 100644
--- a/scenarios/incoming_peer_stir/0021_test.yml.tt2
+++ b/scenarios/incoming_peer_stir/0021_test.yml.tt2
@@ -93,7 +93,7 @@ flow:
       $avp(lua_dlg_profile): None
 sip_in:
   - '^INVITE sip:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@'
-  - 'Contact: sip:[% scenarios.3.username %]@'
+  - 'Contact: <sip:[% scenarios.3.username %]@[% scenarios.3.ip %]:[% scenarios.3.port %](;[^>]+)?>'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios/incoming_peer_stir/0023_test.yml.tt2 b/scenarios/incoming_peer_stir/0023_test.yml.tt2
index 8e7f1c21..4fbe632e 100644
--- a/scenarios/incoming_peer_stir/0023_test.yml.tt2
+++ b/scenarios/incoming_peer_stir/0023_test.yml.tt2
@@ -93,7 +93,7 @@ flow:
       $avp(lua_dlg_profile): None
 sip_in:
   - '^INVITE sip:[% incoming_peer_stir_scenarios_test.testuser1003.phone_number %]@'
-  - 'Contact: sip:[% scenarios.4.username %]@'
+  - 'Contact: <sip:[% scenarios.4.username %]@[% scenarios.4.ip %]:[% scenarios.4.port %](;[^>]+)?>'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios/incoming_peer_stir/sipp_scenario00.xml b/scenarios/incoming_peer_stir/sipp_scenario00.xml
index 89fa48f9..00967fe4 100644
--- a/scenarios/incoming_peer_stir/sipp_scenario00.xml
+++ b/scenarios/incoming_peer_stir/sipp_scenario00.xml
@@ -12,7 +12,7 @@
       CSeq: 1 INVITE
       Identity: eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiaHR0cDovL2Zha2UudXJsL3B1Yi5rZXkifQ.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyI0MzExMDAzIl19LCJpYXQiOjE2MjIxOTU2MzAsIm9yaWciOnsidG4iOiIwMDQzMjEwMDEifSwib3JpZ2lkIjoiZTFhMTdiYmEtZTFjNS00MGEyLTljMDItMTRiZWIzODY4ZjAwIn0.u4q2URmDnODO5OvbXoqsqSoCHJzdcv4WZLrdxeI7GdU17aGEr6Dxpwh2LCGgGlX5SR9Gh343iXbnmdqusJQ59g;info=<http://fake.url/pub.key>;alg=ES256;ppt=shaken
       P-Asserted-Identity: <sip:[field0 file="caller.csv" line=0]@[field2 file="caller.csv" line=0]>
-      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]
@@ -44,7 +44,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       [routes]
       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
 
@@ -69,7 +69,7 @@
       To: <sip:[field1 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: 2 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
diff --git a/scenarios/incoming_peer_stir/sipp_scenario01.xml b/scenarios/incoming_peer_stir/sipp_scenario01.xml
index 93af0062..73a7901f 100644
--- a/scenarios/incoming_peer_stir/sipp_scenario01.xml
+++ b/scenarios/incoming_peer_stir/sipp_scenario01.xml
@@ -11,7 +11,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=1]%///[call_id]
       CSeq: 1 INVITE
       P-Asserted-Identity: <sip:[field0 file="caller.csv" line=1]@[field2 file="caller.csv" line=1]>
-      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]
@@ -40,7 +40,7 @@
       To: <sip:[field1 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
 
diff --git a/scenarios/incoming_peer_stir/sipp_scenario02.xml b/scenarios/incoming_peer_stir/sipp_scenario02.xml
index b1798ad9..b64088a9 100644
--- a/scenarios/incoming_peer_stir/sipp_scenario02.xml
+++ b/scenarios/incoming_peer_stir/sipp_scenario02.xml
@@ -12,7 +12,7 @@
       CSeq: 1 INVITE
       Identity: eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiaHR0cDovL2Zha2UudXJsL3B1Yi5rZXkifQ.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyI0MzExMDAzIl19LCJpYXQiOjE2MjIxOTU2MzAsIm9yaWciOnsidG4iOiIwMDQzMjEwMDEifSwib3JpZ2lkIjoiZTFhMTdiYmEtZTFjNS00MGEyLTljMDItMTRiZWIzODY4ZjAwIn0.u4q2URmDnODO5OvbXoqsqSoCHJzdcv4WZLrdxeI7GdU17aGEr6Dxpwh2LCGgGlX5SR9Gh343iXbnmdqusJQ59g;info=<http://fake.url/pub.key>;alg=ES256;ppt=whatever
       P-Asserted-Identity: <sip:[field0 file="caller.csv" line=2]@[field2 file="caller.csv" line=2]>
-      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -41,7 +41,7 @@
       To: <sip:[field1 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
diff --git a/scenarios/incoming_peer_stir/sipp_scenario03.xml b/scenarios/incoming_peer_stir/sipp_scenario03.xml
index fdaf7a24..05d12277 100644
--- a/scenarios/incoming_peer_stir/sipp_scenario03.xml
+++ b/scenarios/incoming_peer_stir/sipp_scenario03.xml
@@ -12,7 +12,7 @@
       CSeq: 1 INVITE
       Identity: eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiaHR0cDovL2Zha2UudXJsL3B1Yi5rZXkifQ.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyI0MzExMDAzIl19LCJpYXQiOjE2MjIxOTU2MzAsIm9yaWciOnsidG4iOiIwMDQzMjEwMDEifSwib3JpZ2lkIjoiZTFhMTdiYmEtZTFjNS00MGEyLTljMDItMTRiZWIzODY4ZjAwIn0.u4q2URmDnODO5OvbXoqsqSoCHJzdcv4WZLrdxeI7GdU17aGEr6Dxpwh2LCGgGlX5SR9GhKKKKKKKKKKKK;info=<http://fake.url/pub.key>;alg=ES256;ppt=shaken
       P-Asserted-Identity: <sip:[field0 file="caller.csv" line=3]@[field2 file="caller.csv" line=3]>
-      Contact: sip:[field0 file="caller.csv" line=3]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=3]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -41,7 +41,7 @@
       To: <sip:[field1 file="callee.csv" line=3]@[field3 file="callee.csv" line=3]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=3]%///[call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv" line=3]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=3]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
diff --git a/scenarios/incoming_peer_stir/sipp_scenario04.xml b/scenarios/incoming_peer_stir/sipp_scenario04.xml
index c5ff741f..56d39e77 100644
--- a/scenarios/incoming_peer_stir/sipp_scenario04.xml
+++ b/scenarios/incoming_peer_stir/sipp_scenario04.xml
@@ -12,7 +12,7 @@
       CSeq: 1 INVITE
       Identity: eyJhbGciOiJFUzI1NiIsInBwdCI6InNoYWtlbiIsInR5cCI6InBhc3Nwb3J0IiwieDV1IjoiaHR0cDovL2Zha2UudXJsL3B1Yi5rZXkifQ.eyJhdHRlc3QiOiJBIiwiZGVzdCI6eyJ0biI6WyI0MzExMDAzIl19LCJpYXQiOjE2MjIxOTU2MzAsIm9yaWciOnsidG4iOiIwMDQzMjEwMDEifSwib3JpZ2lkIjoiZTFhMTdiYmEtZTFjNS00MGEyLTljMDItMTRiZWIzODY4ZjAwIn0.u4q2URmDnODO5OvbXoqsqSoCHJzdcv4WZLrdxeI7GdU17aGEr6Dxpwh2LCGgGlX5SR9Gh343iXbnmdqusJQ59g;info=<http://[field3 file="callee.csv" line=4]/pub.key>;alg=whatever;ppt=shaken
       P-Asserted-Identity: <sip:[field0 file="caller.csv" line=4]@[field2 file="caller.csv" line=4]>
-      Contact: sip:[field0 file="caller.csv" line=4]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=4]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -41,7 +41,7 @@
       To: <sip:[field1 file="callee.csv" line=4]@[field3 file="callee.csv" line=4]>[peer_tag_param]
       Call-ID: NGCP%[field4 file="callee.csv" line=4]%///[call_id]
       CSeq: 1 ACK
-      Contact: sip:[field0 file="caller.csv" line=4]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=4]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0