diff --git a/scenarios/incoming_hih/0003_test.yml.tt2 b/scenarios/incoming_hih/0003_test.yml.tt2
index d9eb8279..30bd6443 100644
--- a/scenarios/incoming_hih/0003_test.yml.tt2
+++ b/scenarios/incoming_hih/0003_test.yml.tt2
@@ -136,8 +136,8 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - '^INVITE sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - '^INVITE sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@incoming-hih.scenarios.test SIP/2.0'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -149,7 +149,7 @@ sip_out:
       'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@'
     ]
   - [
-      '^INVITE sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@',
+      '^INVITE sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test SIP/2.0',
       'CSeq: 1 INVITE',
       'From: <sip:[% scenarios.0.username %]@',
       'To: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@',
diff --git a/scenarios/incoming_hih/0007_test.yml.tt2 b/scenarios/incoming_hih/0007_test.yml.tt2
index a6a73900..87902fc4 100644
--- a/scenarios/incoming_hih/0007_test.yml.tt2
+++ b/scenarios/incoming_hih/0007_test.yml.tt2
@@ -23,9 +23,9 @@ sip_in:
   - 'P-Caller-UUID: [% incoming_hih_scenarios_test.testuser1003.uuid %]'
   - 'P-NGCP-Caller-Info: <sip:testuser1003@incoming-hih.scenarios.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_hih_scenarios_test.testuser1003.phone_number %]'
   - 'P-NGCP-Forward-Info: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@incoming-hih.scenarios.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_hih_scenarios_test.testuser1003.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% incoming_hih_scenarios_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test>;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% incoming_hih_scenarios_test.testuser1002.phone_number %]'
   - 'P-Asserted-Identity: <sip:004321001@incoming-hih.scenarios.test>'
-  - 'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060'
+  - 'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.port %];)?socket=sip:[% server_ip %]:5060'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length:\s+\d+'
@@ -49,9 +49,9 @@ sip_out:
       'P-Caller-UUID: [% incoming_hih_scenarios_test.testuser1003.uuid %]',
       'P-NGCP-Caller-Info: <sip:testuser1003@incoming-hih.scenarios.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_hih_scenarios_test.testuser1003.phone_number %]',
       'P-NGCP-Forward-Info: <sip:[% incoming_hih_scenarios_test.testuser1003.phone_number %]@incoming-hih.scenarios.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_hih_scenarios_test.testuser1003.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test>;ip=127.0.0.1;port=5060;primary=[% incoming_hih_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% incoming_hih_scenarios_test.testuser1002.phone_number %]@incoming-hih.scenarios.test>;ip=[% scenarios.0.responders.1.ip %];port=[% scenarios.0.responders.1.port %];primary=[% incoming_hih_scenarios_test.testuser1002.phone_number %]',
       'P-Asserted-Identity: <sip:004321001@incoming-hih.scenarios.test>',
-      'P-D-Uri: sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060',
+      'P-D-Uri: sip:lb@127.0.0.1;lr;(received=sip:[% scenarios.0.responders.1.ip %]:[% scenarios.0.responders.1.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_hih/0015_test.yml.tt2 b/scenarios/incoming_hih/0015_test.yml.tt2
index e1d15323..0294afc2 100644
--- a/scenarios/incoming_hih/0015_test.yml.tt2
+++ b/scenarios/incoming_hih/0015_test.yml.tt2
@@ -21,7 +21,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: 1 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -31,7 +31,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: 1 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios/incoming_hih/0018_test.yml.tt2 b/scenarios/incoming_hih/0018_test.yml.tt2
index d2820e6e..2ce23a0f 100644
--- a/scenarios/incoming_hih/0018_test.yml.tt2
+++ b/scenarios/incoming_hih/0018_test.yml.tt2
@@ -26,7 +26,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'
@@ -43,7 +43,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_hih/sipp_scenario00.xml b/scenarios/incoming_hih/sipp_scenario00.xml
index 0b01878f..eb0b61ce 100644
--- a/scenarios/incoming_hih/sipp_scenario00.xml
+++ b/scenarios/incoming_hih/sipp_scenario00.xml
@@ -10,7 +10,7 @@
       To: <sip:[field1 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]>
       History-Info: <sip:+4313012026@incoming-hih.scenarios.test;user=phone?privacy=history>;index=1
       History-Info: <sip:+[field1 file="callee.csv" line=0]@incoming-hih.scenarios.test;user=phone;cause=302>;index=1.1
       Max-Forwards: 70
@@ -51,7 +51,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
 
@@ -76,7 +76,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