diff --git a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
index 44829fd2..400efe6a 100644
--- a/scenarios_lnp/incoming_peer/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
@@ -136,7 +136,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:[% incoming_peer_scenarios_lnp_test.testuser1001.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'
@@ -152,7 +152,7 @@ sip_out:
       'CSeq: 1 INVITE',
       'From: <sip:[% scenarios.0.username %]@',
       'To: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Type: application/sdp',
       'P-HIH-Cause: 302',
       'P-From-Peer: 1',
diff --git a/scenarios_lnp/incoming_peer/0004_test.yml.tt2 b/scenarios_lnp/incoming_peer/0004_test.yml.tt2
index ac12fd5c..bbd82fa7 100644
--- a/scenarios_lnp/incoming_peer/0004_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0004_test.yml.tt2
@@ -21,7 +21,7 @@ sip_in:
   - 'P-NGCP-Caller-Info: <sip:testuser1001@incoming-peer.scenarios-lnp.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]'
   - 'P-NGCP-Forward-Info: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@incoming-peer.scenarios-lnp.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]'
   - 'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@incoming-peer.scenarios-lnp.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]'
-  - 'P-Asserted-Identity: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>'
+  - 'P-Asserted-Identity: <sip:[% scenarios.0.devid %]@[% scenarios.0.domain %]>'
   - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
@@ -44,7 +44,7 @@ sip_out:
       'P-NGCP-Caller-Info: <sip:testuser1001@incoming-peer.scenarios-lnp.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]',
       'P-NGCP-Forward-Info: <sip:[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]@incoming-peer.scenarios-lnp.test>;ip=127.0.0.1;port=508[08];primary=[% incoming_peer_scenarios_lnp_test.testuser1001.phone_number %]',
       'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@incoming-peer.scenarios-lnp.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]',
-      'P-Asserted-Identity: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>',
+      'P-Asserted-Identity: <sip:[% scenarios.0.devid %]@[% scenarios.0.domain %]>',
       'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
diff --git a/scenarios_lnp/incoming_peer/0016_test.yml.tt2 b/scenarios_lnp/incoming_peer/0016_test.yml.tt2
index dc210875..8aaf921b 100644
--- a/scenarios_lnp/incoming_peer/0016_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0016_test.yml.tt2
@@ -27,7 +27,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'
@@ -44,7 +44,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_lnp/incoming_peer/peer.yml b/scenarios_lnp/incoming_peer/peer.yml
index e4a06885..4b120d77 100644
--- a/scenarios_lnp/incoming_peer/peer.yml
+++ b/scenarios_lnp/incoming_peer/peer.yml
@@ -14,7 +14,7 @@ peer_incoming_peer_00:
   inboundrules:
     - group_id: peer_incoming_peer_00_group
       field: "ruri_uri"
-      pattern: '.*'
+      pattern: "^sip:.+@incoming-peer.scenarios-lnp.test"
       priority: 50
       enabled: 1
   hosts:
@@ -40,8 +40,8 @@ peer_incoming_peer_01:
   rules:
     - group_id: peer_incoming_peer_01_group
       callee_prefix: ""
-      callee_pattern: ''
-      caller_pattern: '^sip:.+@incoming-peer.scenarios-lnp.test'
+      callee_pattern: ""
+      caller_pattern: "^sip:.+@incoming-peer.scenarios-lnp.test"
       description: ""
   hosts:
     - group_id: peer_incoming_peer_01_group
diff --git a/scenarios_lnp/incoming_peer/sipp_scenario00.xml b/scenarios_lnp/incoming_peer/sipp_scenario00.xml
index 016526b5..0dc0c326 100644
--- a/scenarios_lnp/incoming_peer/sipp_scenario00.xml
+++ b/scenarios_lnp/incoming_peer/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]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -49,7 +49,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
 
@@ -74,7 +74,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_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
index 89b22a19..e69f1a74 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
@@ -83,14 +83,14 @@ sip_in:
   - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'From: <sip:[% scenarios.0.username %]@[% scenarios.0.domain %]>',
       'To: <sip:[% extra_info.phone_numbers.0 %]',
       'CSeq: 1 INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
       'Content-Length:\s+0'
     ]
@@ -99,7 +99,7 @@ sip_out:
       'From: <sip:[% scenarios.0.username %]@[% scenarios.0.domain %]>',
       'To: <sip:[% extra_info.phone_numbers.0 %]@',
       'CSeq: 1 INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
       'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %]',
       'P-NGCP-Callee-Info: <sip:[% extra_info.phone_numbers.0 %]@incoming-peer-unallocated-authoritative.scenarios-lnp.test>;ip=incoming-peer-unallocated-authoritative.scenarios-lnp.test;port=5060',
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml b/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml
index 19cc1840..7983ddf1 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml
@@ -14,7 +14,7 @@ peer_incoming_peer_ua_00:
   inboundrules:
     - group_id: peer_incoming_peer_ua_00_group
       field: "ruri_uri"
-      pattern: '.*'
+      pattern: "^sip:.+@incoming-peer-unallocated-authoritative.scenarios-lnp.test"
       priority: 50
       enabled: 1
   hosts:
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/sipp_scenario00.xml b/scenarios_lnp/incoming_peer_unallocated_authoritative/sipp_scenario00.xml
index d3ecebba..a813eb78 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/sipp_scenario00.xml
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/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]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -42,7 +42,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 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
 
diff --git a/scenarios_lnp/invite/0001_test.yml.tt2 b/scenarios_lnp/invite/0001_test.yml.tt2
index 06d5bb79..572adf68 100644
--- a/scenarios_lnp/invite/0001_test.yml.tt2
+++ b/scenarios_lnp/invite/0001_test.yml.tt2
@@ -22,7 +22,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE sip:[% invite_scenarios_lnp_test.testuser1001.phone_number %]@'
-  - 'Contact: sip:[% scenarios.0.username %]@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'To: <sip:[% invite_scenarios_lnp_test.testuser1001.phone_number %]@'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
diff --git a/scenarios_lnp/invite/0003_test.yml.tt2 b/scenarios_lnp/invite/0003_test.yml.tt2
index 5d9d5989..0c093fbf 100644
--- a/scenarios_lnp/invite/0003_test.yml.tt2
+++ b/scenarios_lnp/invite/0003_test.yml.tt2
@@ -235,7 +235,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:[% invite_scenarios_lnp_test.testuser1001.phone_number %]@'
-  - '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_lnp/invite/0011_test.yml.tt2 b/scenarios_lnp/invite/0011_test.yml.tt2
index 6c7a0bcd..3ce34f84 100644
--- a/scenarios_lnp/invite/0011_test.yml.tt2
+++ b/scenarios_lnp/invite/0011_test.yml.tt2
@@ -25,7 +25,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'
@@ -35,7 +35,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_lnp/invite/0013_test.yml.tt2 b/scenarios_lnp/invite/0013_test.yml.tt2
index 0a209eea..c422d824 100644
--- a/scenarios_lnp/invite/0013_test.yml.tt2
+++ b/scenarios_lnp/invite/0013_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_lnp/invite/sipp_scenario00.xml b/scenarios_lnp/invite/sipp_scenario00.xml
index e04c038a..76382103 100644
--- a/scenarios_lnp/invite/sipp_scenario00.xml
+++ b/scenarios_lnp/invite/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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[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=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
 
@@ -59,7 +59,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: 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
@@ -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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[local_ip]:[local_port]>
       Max-Forwards: 70
       Content-Length: 0
 
@@ -124,7 +124,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: 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_lnp/invite_ncos_black/0001_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0001_test.yml.tt2
index 837effb4..93b3f6f2 100644
--- a/scenarios_lnp/invite_ncos_black/0001_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0001_test.yml.tt2
@@ -22,7 +22,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 1 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2
index d6c921e0..9116b0bb 100644
--- a/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0003_test.yml.tt2
@@ -99,7 +99,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE sip:[% extra_info.phone_numbers.2 %]@'
-  - '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_lnp/invite_ncos_black/0005_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0005_test.yml.tt2
index 07449080..25ff429c 100644
--- a/scenarios_lnp/invite_ncos_black/0005_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0005_test.yml.tt2
@@ -30,12 +30,12 @@ sip_in:
   - 'P-NGCP-Src-Port: [% scenarios.1.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.1.ip %]',
       'Content-Length: 0'
     ]
diff --git a/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2
index 538511ba..746409a8 100644
--- a/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0007_test.yml.tt2
@@ -109,7 +109,7 @@ sip_in:
   - 'P-NGCP-Src-Port: [% scenarios.1.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
@@ -119,7 +119,7 @@ sip_out:
   - [
       '^SIP/2.0 101 Connecting',
       'CSeq: 2 INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.1.ip %]',
       'P-NGCP-Authorization: [% scenarios.0.username %]@',
       'P-NGCP-Authorized: 1',
@@ -132,7 +132,7 @@ sip_out:
       'From: <sip:[% scenarios.0.username %]@',
       'To: <sip:[% extra_info.phone_numbers.3 %]@',
       'CSeq: 2 INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.1.ip %]',
       'P-NGCP-Authorization: [% scenarios.0.username %]@',
       'P-NGCP-Authorized: 1',
diff --git a/scenarios_lnp/invite_ncos_black/0009_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0009_test.yml.tt2
index cac139c0..42610f39 100644
--- a/scenarios_lnp/invite_ncos_black/0009_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0009_test.yml.tt2
@@ -30,12 +30,12 @@ sip_in:
   - 'P-NGCP-Src-Port: [% scenarios.2.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.2.ip %]',
       'Content-Length: 0'
     ]
diff --git a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
index 5a3d4bef..db2ea381 100644
--- a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
@@ -206,14 +206,14 @@ sip_in:
   - 'P-NGCP-Src-Port: [% scenarios.2.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'From: <sip:[% scenarios.0.username %]@',
       'To: <sip:[% extra_info.phone_numbers.4 %]@',
       'CSeq: 2 INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.2.ip %]',
       'Content-Length: 0'
     ]
@@ -225,7 +225,7 @@ sip_out:
       'From: <sip:[% invite_ncos_black_scenarios_lnp_test.testuser1002.phone_number %]@',
       'To: <sip:[% extra_info.phone_numbers.4 %]@',
       'CSeq: 2 INVITE',
-      'Contact: sip:[% scenarios.0.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %]',
+      'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>',
       'Max-Forwards: 68',
       'Content-Type: application/sdp',
       'P-Caller-UUID: [% invite_ncos_black_scenarios_lnp_test.testuser1002.uuid %]',
diff --git a/scenarios_lnp/invite_ncos_black/0019_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0019_test.yml.tt2
index 61d8f620..341a4f33 100644
--- a/scenarios_lnp/invite_ncos_black/0019_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0019_test.yml.tt2
@@ -25,17 +25,17 @@ 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.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>'
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'From: <sip:[% scenarios.2.username %]@'
   - 'To: <sip:[% extra_info.phone_numbers.4 %]@'
 
 sip_out:
   - [
       '^ACK sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios_lnp/invite_ncos_black/0021_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0021_test.yml.tt2
index 96f5e138..5943b4b6 100644
--- a/scenarios_lnp/invite_ncos_black/0021_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0021_test.yml.tt2
@@ -29,11 +29,11 @@ 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.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>'
   - 'CSeq: 3 BYE'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
-  - 'From: <sip:[% scenarios.0.username %]@'
+  - 'From: <sip:[% scenarios.2.username %]@'
   - 'To: <sip:[% extra_info.phone_numbers.4 %]@'
 
 sip_out:
@@ -41,12 +41,12 @@ sip_out:
       '^SIP/2.0 100 Trying',
       'CSeq: 3 BYE',
       'Content-Length: 0',
-      'From: <sip:[% scenarios.0.username %]@',
+      'From: <sip:[% scenarios.2.username %]@',
       'To: <sip:[% extra_info.phone_numbers.4 %]@'
     ]
   - [
       '^BYE sip:127.0.0.1:5080(;prxroute=1)? SIP/2.0',
-      'Contact: sip:[% scenarios.0.username %]@',
+      'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>',
       'CSeq: 3 BYE',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios_lnp/invite_ncos_black/sipp_scenario00.xml b/scenarios_lnp/invite_ncos_black/sipp_scenario00.xml
index 83f18a13..d0929aa6 100644
--- a/scenarios_lnp/invite_ncos_black/sipp_scenario00.xml
+++ b/scenarios_lnp/invite_ncos_black/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"]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv"]@[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=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
 
@@ -59,7 +59,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: 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
@@ -92,7 +92,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 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
 
diff --git a/scenarios_lnp/invite_ncos_black/sipp_scenario01.xml b/scenarios_lnp/invite_ncos_black/sipp_scenario01.xml
index 157cd950..be0a9893 100644
--- a/scenarios_lnp/invite_ncos_black/sipp_scenario01.xml
+++ b/scenarios_lnp/invite_ncos_black/sipp_scenario01.xml
@@ -10,7 +10,7 @@
       To: <sip:[field1 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]
@@ -41,7 +41,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
 
@@ -59,7 +59,7 @@
       To: <sip:[field1 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
@@ -92,7 +92,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: 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
 
diff --git a/scenarios_lnp/invite_ncos_black/sipp_scenario02.xml b/scenarios_lnp/invite_ncos_black/sipp_scenario02.xml
index 1fbf9c52..e7163030 100644
--- a/scenarios_lnp/invite_ncos_black/sipp_scenario02.xml
+++ b/scenarios_lnp/invite_ncos_black/sipp_scenario02.xml
@@ -10,7 +10,7 @@
       To: <sip:[field1 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       CSeq: 1 INVITE
-      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
 
@@ -59,7 +59,7 @@
       To: <sip:[field1 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       CSeq: 2 INVITE
-      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
       [field1 file="caller.csv" line=2]
       Content-Type: application/sdp
@@ -99,7 +99,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       [routes]
       CSeq: 2 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
 
@@ -124,7 +124,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: 3 BYE
-      Contact: sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="caller.csv" line=2]@[local_ip]:[local_port]>
       [routes]
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios_lnp/invite_ncos_white/0001_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0001_test.yml.tt2
index 21fbeffc..b18a9444 100644
--- a/scenarios_lnp/invite_ncos_white/0001_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0001_test.yml.tt2
@@ -30,12 +30,12 @@ sip_in:
   - 'P-NGCP-Src-Port: [% scenarios.0.port %]'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
       'Content-Length: 0'
     ]
diff --git a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
index 364d2e9f..6de2fd8f 100644
--- a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
@@ -187,7 +187,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:[% extra_info.phone_numbers.2 %]@'
-  - '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_lnp/invite_ncos_white/0011_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0011_test.yml.tt2
index 843c3e43..fe1036dd 100644
--- a/scenarios_lnp/invite_ncos_white/0011_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0011_test.yml.tt2
@@ -25,7 +25,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'
@@ -35,7 +35,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_lnp/invite_ncos_white/0013_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0013_test.yml.tt2
index 128bff9b..b200a2db 100644
--- a/scenarios_lnp/invite_ncos_white/0013_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0013_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_lnp/invite_ncos_white/0017_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
index a139ae07..ae21a291 100644
--- a/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
@@ -30,12 +30,12 @@ sip_in:
   - 'P-NGCP-Src-Port: \d+'
   - 'P-NGCP-Src-Proto: udp'
   - 'P-NGCP-Src-Af: 4'
-  - 'P-Sock-Info: udp:127.0.0.1:5060'
+  - 'P-Sock-Info: udp:[% server_ip %]:5060'
 sip_out:
   - [
       '^SIP/2.0 100 Trying',
       'CSeq: 1 INVITE',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
       'P-NGCP-Auth-IP: [% scenarios.0.ip %]',
       'Content-Length: 0'
     ]
diff --git a/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2
index 9f559a62..a46371c3 100644
--- a/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0019_test.yml.tt2
@@ -193,7 +193,7 @@ flow:
       ]
 sip_in:
   - '^INVITE sip:[% extra_info.phone_numbers.3 %]@'
-  - 'Contact: sip:[% scenarios.0.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_lnp/invite_ncos_white/0027_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0027_test.yml.tt2
index 981b3ffc..c2c1be41 100644
--- a/scenarios_lnp/invite_ncos_white/0027_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0027_test.yml.tt2
@@ -25,7 +25,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^ACK 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: 2 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
@@ -35,7 +35,7 @@ sip_in:
 sip_out:
   - [
       '^ACK 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: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0',
diff --git a/scenarios_lnp/invite_ncos_white/0029_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0029_test.yml.tt2
index 50dc1fd1..aabe260a 100644
--- a/scenarios_lnp/invite_ncos_white/0029_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0029_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_lnp/invite_ncos_white/0033_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0033_test.yml.tt2
index 2bb5724c..364cfa5c 100644
--- a/scenarios_lnp/invite_ncos_white/0033_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0033_test.yml.tt2
@@ -22,7 +22,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:[% scenarios.1.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_lnp/invite_ncos_white/0035_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0035_test.yml.tt2
index c841ea7b..9668acbb 100644
--- a/scenarios_lnp/invite_ncos_white/0035_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0035_test.yml.tt2
@@ -98,7 +98,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE sip:[% extra_info.phone_numbers.4 %]@'
-  - 'Contact: sip:[% scenarios.1.username %]@'
+  - 'Contact: <sip:[% scenarios.2.username %]@[% scenarios.2.ip %]:[% scenarios.2.port %](;[^>]+)?>'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
diff --git a/scenarios_lnp/invite_ncos_white/sipp_scenario00.xml b/scenarios_lnp/invite_ncos_white/sipp_scenario00.xml
index 903a09f3..7381ebfa 100644
--- a/scenarios_lnp/invite_ncos_white/sipp_scenario00.xml
+++ b/scenarios_lnp/invite_ncos_white/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]>
       Max-Forwards: 70
       Content-Type: application/sdp
       Content-Length: [len]
@@ -41,7 +41,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: 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:[field1 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:[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: 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
diff --git a/scenarios_lnp/invite_ncos_white/sipp_scenario01.xml b/scenarios_lnp/invite_ncos_white/sipp_scenario01.xml
index 6e76ae65..33025649 100644
--- a/scenarios_lnp/invite_ncos_white/sipp_scenario01.xml
+++ b/scenarios_lnp/invite_ncos_white/sipp_scenario01.xml
@@ -10,7 +10,7 @@
       To: <sip:[field1 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]
@@ -41,7 +41,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
 
@@ -59,7 +59,7 @@
       To: <sip:[field1 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
@@ -99,7 +99,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
 
@@ -124,7 +124,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: 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
diff --git a/scenarios_lnp/invite_ncos_white/sipp_scenario02.xml b/scenarios_lnp/invite_ncos_white/sipp_scenario02.xml
index db3003a5..84fb55b2 100644
--- a/scenarios_lnp/invite_ncos_white/sipp_scenario02.xml
+++ b/scenarios_lnp/invite_ncos_white/sipp_scenario02.xml
@@ -10,7 +10,7 @@
       To: <sip:[field1 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       CSeq: 1 INVITE
-      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
 
@@ -59,7 +59,7 @@
       To: <sip:[field1 file="callee.csv" line=2]@[field3 file="callee.csv" line=2]>
       Call-ID: NGCP%[field4 file="callee.csv" line=2]%///[call_id]
       CSeq: 2 INVITE
-      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
       [field1 file="caller.csv" line=2]
       Content-Type: application/sdp
@@ -92,7 +92,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: 2 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_lnp/invite_peerout/0001_test.yml.tt2 b/scenarios_lnp/invite_peerout/0001_test.yml.tt2
index aab6ff9c..29c12be5 100644
--- a/scenarios_lnp/invite_peerout/0001_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/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_lnp/invite_peerout/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
index 9b20d36d..5d1a5cf3 100644
--- a/scenarios_lnp/invite_peerout/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
@@ -217,7 +217,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_lnp/invite_peerout/0005_test.yml.tt2 b/scenarios_lnp/invite_peerout/0005_test.yml.tt2
index 297d91e7..96349ec0 100644
--- a/scenarios_lnp/invite_peerout/0005_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0005_test.yml.tt2
@@ -13,16 +13,16 @@ flow:
   - return|ROUTE_RUNTIME:
   - exit|ROUTE_EXIT:
 sip_in:
-  - 'INVITE sip:0043test28881001;npdi@127.0.2.1:\d+;transport=udp SIP/2.0'
+  - 'INVITE sip:0043test28881001;npdi@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0'
   - 'From: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>;tag=[\w-]+'
-  - 'To: <sip:0043test28881001;npdi@127.0.2.1>'
+  - 'To: <sip:0043test28881001;npdi@[% scenarios.0.responders.0.ip %]>'
   - 'CSeq: \d+ INVITE'
   - 'P-LB-Uptime: \d+'
   - 'P-Asserted-Identity: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>'
   - 'P-Caller-UUID: [% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]'
-  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-peerout.scenarios-lnp.test>;ip=127.126.0.1;port=\d+;primary=[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]'
-  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-peerout.scenarios-lnp.test>;ip=127.0.2.1;port=\d+'
-  - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:127.0.2.1:\d+%3blr%3btransport%3dudp'
+  - 'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-peerout.scenarios-lnp.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]'
+  - 'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-peerout.scenarios-lnp.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]'
+  - 'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp'
   - 'Content-Type: application/sdp'
   - 'Contact: <sip:127.0.0.1:508[08];transport=udp>'
   - 'Content-Length:\s+\d+'
@@ -30,22 +30,22 @@ sip_out:
   - [
       'SIP/2.0 100 Trying',
       'From: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>;tag=[\w-]+',
-      'To: <sip:0043test28881001;npdi@127.0.2.1>',
+      'To: <sip:0043test28881001;npdi@[% scenarios.0.responders.0.ip %]>',
       'CSeq: \d+ INVITE',
       'Server: Sipwise NGCP Proxy',
       'Content-Length: 0',
     ]
   - [
-      'INVITE sip:0043test28881001;npdi@127.0.2.1:\d+;transport=udp SIP/2.0',
+      'INVITE sip:0043test28881001;npdi@[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %];transport=udp SIP/2.0',
       'From: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>;tag=[\w-]+',
-      'To: <sip:0043test28881001;npdi@127.0.2.1>',
+      'To: <sip:0043test28881001;npdi@[% scenarios.0.responders.0.ip %]>',
       'CSeq: \d+ INVITE',
       'P-LB-Uptime: \d+',
       'P-Asserted-Identity: <sip:[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]@invite-peerout.scenarios-lnp.test>',
       'P-Caller-UUID: [% invite_peerout_scenarios_lnp_test.testuser1002.uuid %]',
-      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-peerout.scenarios-lnp.test>;ip=127.126.0.1;port=\d+;primary=[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]',
-      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-peerout.scenarios-lnp.test>;ip=127.0.2.1;port=\d+',
-      'P-D-Uri: sip:127.0.0.1:5060;received=sip:127.0.2.1:\d+%3blr%3btransport%3dudp',
+      'P-NGCP-Caller-Info: <sip:[% scenarios.0.username %]@invite-peerout.scenarios-lnp.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:[% scenarios.0.responders.0.username %]@invite-peerout.scenarios-lnp.test>;ip=[% scenarios.0.responders.0.ip %];port=[% scenarios.0.responders.0.port %]',
+      'P-D-Uri: sip:127.0.0.1:5060;received=sip:[% scenarios.0.responders.0.ip %]:[% scenarios.0.responders.0.port %]%3blr%3btransport%3dudp',
       'Content-Type: application/sdp',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length:\s+\d+',
diff --git a/scenarios_lnp/invite_peerout/0011_test.yml.tt2 b/scenarios_lnp/invite_peerout/0011_test.yml.tt2
index e0d7b65b..5b16672b 100644
--- a/scenarios_lnp/invite_peerout/0011_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0011_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_lnp/invite_peerout/0013_test.yml.tt2 b/scenarios_lnp/invite_peerout/0013_test.yml.tt2
index 31ad46d8..4cccab35 100644
--- a/scenarios_lnp/invite_peerout/0013_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/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: 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_lnp/invite_peerout/cdr_test.yml.tt2 b/scenarios_lnp/invite_peerout/cdr_test.yml.tt2
index 2893b75c..97af86a3 100644
--- a/scenarios_lnp/invite_peerout/cdr_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/cdr_test.yml.tt2
@@ -3,7 +3,7 @@ cdr:
     source_domain: 'invite-peerout.scenarios-lnp.test'
     source_cli: '[% invite_peerout_scenarios_lnp_test.testuser1002.phone_number %]'
     destination_user: '0043test28881001'
-    destination_domain: '127.0.2.1'
+    destination_domain: '[% scenarios.0.responders.0.ip %]'
     destination_user_dialed: '[% scenarios.0.responders.0.username %]'
     call_type: 'call'
     call_status: 'ok'
diff --git a/scenarios_lnp/invite_peerout/sipp_scenario00.xml b/scenarios_lnp/invite_peerout/sipp_scenario00.xml
index 750a70e4..b5921982 100644
--- a/scenarios_lnp/invite_peerout/sipp_scenario00.xml
+++ b/scenarios_lnp/invite_peerout/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
diff --git a/scenarios_lnp/invite_peerout_rn/0001_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0001_test.yml.tt2
index aab6ff9c..29c12be5 100644
--- a/scenarios_lnp/invite_peerout_rn/0001_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/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_lnp/invite_peerout_rn/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
index 6279939f..7f13218c 100644
--- a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
@@ -198,7 +198,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_lnp/invite_peerout_rn/0011_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0011_test.yml.tt2
index c5e604ec..9ed674e3 100644
--- a/scenarios_lnp/invite_peerout_rn/0011_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0011_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_lnp/invite_peerout_rn/0013_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0013_test.yml.tt2
index 9f82f461..4717664a 100644
--- a/scenarios_lnp/invite_peerout_rn/0013_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0013_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_lnp/invite_peerout_rn/sipp_scenario00.xml b/scenarios_lnp/invite_peerout_rn/sipp_scenario00.xml
index 750a70e4..b5921982 100644
--- a/scenarios_lnp/invite_peerout_rn/sipp_scenario00.xml
+++ b/scenarios_lnp/invite_peerout_rn/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
diff --git a/scenarios_lnp/register_lock_ported/0001_test.yml.tt2 b/scenarios_lnp/register_lock_ported/0001_test.yml.tt2
index ba47f601..dfeb4f62 100644
--- a/scenarios_lnp/register_lock_ported/0001_test.yml.tt2
+++ b/scenarios_lnp/register_lock_ported/0001_test.yml.tt2
@@ -16,7 +16,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:testuser1003@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
 sip_out:
diff --git a/scenarios_lnp/register_lock_ported/0002_test.yml.tt2 b/scenarios_lnp/register_lock_ported/0002_test.yml.tt2
index 318a63e5..a76d2f53 100644
--- a/scenarios_lnp/register_lock_ported/0002_test.yml.tt2
+++ b/scenarios_lnp/register_lock_ported/0002_test.yml.tt2
@@ -46,7 +46,7 @@ flow:
         - caller
 sip_in:
   - '^REGISTER'
-  - 'Contact: sip:testuser1003@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'Expires: 600'
   - 'Authorization: Digest username="testuser1003"'
diff --git a/scenarios_lnp/register_lock_ported/sipp_scenario00.xml b/scenarios_lnp/register_lock_ported/sipp_scenario00.xml
index 45997674..1b739324 100644
--- a/scenarios_lnp/register_lock_ported/sipp_scenario00.xml
+++ b/scenarios_lnp/register_lock_ported/sipp_scenario00.xml
@@ -11,7 +11,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 REGISTER
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -35,7 +35,7 @@
       Call-ID: NGCP%[field4 file="callee.csv" line=0]%///[call_id]
       CSeq: 2 REGISTER
       [field2 file="callee.csv" line=0]
-      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
+      Contact: <sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]>
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0