diff --git a/scenarios/invite_lateoam/0003_test.yml.tt2 b/scenarios/invite_lateoam/0003_test.yml.tt2
index 745fed45..2153fb32 100644
--- a/scenarios/invite_lateoam/0003_test.yml.tt2
+++ b/scenarios/invite_lateoam/0003_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_lateoam/0005_test.yml.tt2 b/scenarios/invite_lateoam/0005_test.yml.tt2
index 49bad039..4ca61fb4 100644
--- a/scenarios/invite_lateoam/0005_test.yml.tt2
+++ b/scenarios/invite_lateoam/0005_test.yml.tt2
@@ -207,7 +207,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-Length: 0'
@@ -231,8 +231,8 @@ sip_out:
       'From: <sip:[% invite_lateoam_scenarios_test.testuser1002.phone_number %]@',
       'To: <sip:[% scenarios.0.responders.0.username %]@',
       'Content-Length: 0',
-      'P-Caller-UUID: \w+',
-      'P-Callee-UUID: \w+',
+      'P-Caller-UUID: [% invite_lateoam_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_lateoam_scenarios_test.testuser1003.uuid %]',
       'P-Asserted-Identity: <sip:[% invite_lateoam_scenarios_test.testuser1002.phone_number %]@',
       'P-Called-Party-ID: <sip:[% scenarios.0.responders.0.username %]@',
       'P-App-Param: ;calltimer=21600;aleg_sst_enable=no;sst_enable=no',
diff --git a/scenarios/invite_lateoam/0006_test.yml.tt2 b/scenarios/invite_lateoam/0006_test.yml.tt2
index 5b2a3012..9a52e5fb 100644
--- a/scenarios/invite_lateoam/0006_test.yml.tt2
+++ b/scenarios/invite_lateoam/0006_test.yml.tt2
@@ -21,8 +21,8 @@ sip_in:
   - 'P-Asserted-Identity: <sip:[% invite_lateoam_scenarios_test.testuser1002.phone_number %]@invite-lateoam.scenarios.test>'
   - 'P-Caller-UUID: [% invite_lateoam_scenarios_test.testuser1002.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-lateoam.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_lateoam_scenarios_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-lateoam.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_lateoam_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-lateoam.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_lateoam_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'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length: 0'
 sip_out:
@@ -43,8 +43,8 @@ sip_out:
       'P-Asserted-Identity: <sip:[% invite_lateoam_scenarios_test.testuser1002.phone_number %]@invite-lateoam.scenarios.test>',
       'P-Caller-UUID: [% invite_lateoam_scenarios_test.testuser1002.uuid %]',
       'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-lateoam.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_lateoam_scenarios_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-lateoam.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% invite_lateoam_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-lateoam.scenarios.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %];primary=[% invite_lateoam_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',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length: 0',
     ]
diff --git a/scenarios/invite_lateoam/0015_test.yml.tt2 b/scenarios/invite_lateoam/0015_test.yml.tt2
index cfbcdfa2..485bd269 100644
--- a/scenarios/invite_lateoam/0015_test.yml.tt2
+++ b/scenarios/invite_lateoam/0015_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_lateoam/sipp_scenario00.xml b/scenarios/invite_lateoam/sipp_scenario00.xml
index 35a8694a..b8ae628c 100644
--- a/scenarios/invite_lateoam/sipp_scenario00.xml
+++ b/scenarios/invite_lateoam/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-Length: 0
 
@@ -31,7 +31,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
 
@@ -49,7 +49,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-Length: 0
@@ -79,7 +79,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-Type: application/sdp
       Content-Length: [len]
@@ -114,7 +114,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