diff --git a/scenarios/invite_emergency_pidflo/0001_test.yml.tt2 b/scenarios/invite_emergency_pidflo/0001_test.yml.tt2
index d97ac191..45f32435 100644
--- a/scenarios/invite_emergency_pidflo/0001_test.yml.tt2
+++ b/scenarios/invite_emergency_pidflo/0001_test.yml.tt2
@@ -25,14 +25,14 @@ sip_in:
   - 'From: <sip:testuser1002@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:112@invite-emergency-pidflo.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:testuser1002@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
   - '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'
   - 'P-LB-Uptime: \d+'
 sip_out:
   - [
@@ -40,7 +40,7 @@ sip_out:
       'From: <sip:testuser1002@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'To: <sip:112@invite-emergency-pidflo.scenarios.test>',
       'CSeq: \d+ 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-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -51,7 +51,7 @@ sip_out:
       'From: <sip:testuser1002@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'To: <sip:112@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ 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-Auth-UA: <null>',
       'Proxy-Authenticate: Digest realm="invite-emergency-pidflo.scenarios.test", nonce=".+"',
diff --git a/scenarios/invite_emergency_pidflo/0003_test.yml.tt2 b/scenarios/invite_emergency_pidflo/0003_test.yml.tt2
index e1e08ec4..d61a1709 100644
--- a/scenarios/invite_emergency_pidflo/0003_test.yml.tt2
+++ b/scenarios/invite_emergency_pidflo/0003_test.yml.tt2
@@ -167,15 +167,15 @@ sip_in:
   - 'From: <sip:testuser1002@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:112@invite-emergency-pidflo.scenarios.test>'
   - 'CSeq: \d+ INVITE'
-  - 'Contact: sip:testuser1002@[% scenarios.0.ip %]:[% scenarios.0.port %]'
-  - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-emergency-pidflo.scenarios.test",uri="sip:127.0.0.1:5060",nonce=".+",response=".+",algorithm=MD5'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
+  - 'Proxy-Authorization: Digest username="testuser1002",realm="invite-emergency-pidflo.scenarios.test",uri="sip:[% server_ip %]:5060",nonce=".+",response=".+",algorithm=MD5'
   - 'Content-Type: application/sdp'
   - 'Content-Length:\s+\d+'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
   - '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'
   - 'P-LB-Uptime: \d+'
 sip_out:
   - [
@@ -183,7 +183,7 @@ sip_out:
       'From: <sip:testuser1002@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'To: <sip:112@invite-emergency-pidflo.scenarios.test>',
       'CSeq: \d+ 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-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -194,7 +194,7 @@ sip_out:
       'From: <sip:testuser1002@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'To: <sip:112@invite-emergency-pidflo.scenarios.test>',
       'CSeq: \d+ 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-Auth-UA: <null>',
       'P-NGCP-Authorization: testuser1002@invite-emergency-pidflo.scenarios.test',
@@ -209,7 +209,7 @@ sip_out:
       'From: <sip:[% invite_emergency_pidflo_scenarios_test.testuser1002.phone_number %]@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'To: <sip:112@invite-emergency-pidflo.scenarios.test>',
       'CSeq: \d+ INVITE',
-      'Contact: sip:testuser1002@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
       'P-LB-Uptime: \d+',
diff --git a/scenarios/invite_emergency_pidflo/0008_test.yml.tt2 b/scenarios/invite_emergency_pidflo/0008_test.yml.tt2
index 529d7a75..0ce5d474 100644
--- a/scenarios/invite_emergency_pidflo/0008_test.yml.tt2
+++ b/scenarios/invite_emergency_pidflo/0008_test.yml.tt2
@@ -27,5 +27,5 @@ sip_out:
       'CSeq: \d+ INVITE',
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Length: 0',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]
diff --git a/scenarios/invite_emergency_pidflo/0010_test.yml.tt2 b/scenarios/invite_emergency_pidflo/0010_test.yml.tt2
index 99f1c13e..ee131e76 100644
--- a/scenarios/invite_emergency_pidflo/0010_test.yml.tt2
+++ b/scenarios/invite_emergency_pidflo/0010_test.yml.tt2
@@ -40,5 +40,5 @@ sip_out:
       'Contact: <sip:127.0.0.1:508[08];transport=udp>',
       'Content-Type: application/sdp',
       'Content-Length:\s+\d+',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]
diff --git a/scenarios/invite_emergency_pidflo/0011_test.yml.tt2 b/scenarios/invite_emergency_pidflo/0011_test.yml.tt2
index 272965f6..c0a7a929 100644
--- a/scenarios/invite_emergency_pidflo/0011_test.yml.tt2
+++ b/scenarios/invite_emergency_pidflo/0011_test.yml.tt2
@@ -28,13 +28,13 @@ sip_in:
   - 'From: <sip:testuser1002@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:112@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ ACK'
-  - 'Contact: sip:testuser1002@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
   - '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'
   - 'P-LB-Uptime: \d+'
 sip_out:
   - [
@@ -42,12 +42,12 @@ sip_out:
       'From: <sip:[% invite_emergency_pidflo_scenarios_test.testuser1002.phone_number %]@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'To: <sip:112@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ ACK',
-      'Contact: sip:testuser1002@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Length: 0',
       'P-NGCP-Src-Ip: [% scenarios.0.ip %]',
       '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',
       'P-LB-Uptime: \d+',
     ]
diff --git a/scenarios/invite_emergency_pidflo/0013_test.yml.tt2 b/scenarios/invite_emergency_pidflo/0013_test.yml.tt2
index 5f588033..f4fa09d4 100644
--- a/scenarios/invite_emergency_pidflo/0013_test.yml.tt2
+++ b/scenarios/invite_emergency_pidflo/0013_test.yml.tt2
@@ -32,13 +32,13 @@ sip_in:
   - 'From: <sip:testuser1002@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+'
   - 'To: <sip:112@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+'
   - 'CSeq: \d+ BYE'
-  - 'Contact: sip:testuser1002@[% scenarios.0.ip %]:[% scenarios.0.port %]'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'Content-Length: 0'
   - 'P-NGCP-Src-Ip: [% scenarios.0.ip %]'
   - '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'
   - 'P-LB-Uptime: \d+'
 sip_out:
   - [
@@ -46,7 +46,7 @@ sip_out:
       'From: <sip:testuser1002@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'To: <sip:112@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
-      '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-Auth-UA: <null>',
       'Server: Sipwise NGCP Proxy',
@@ -57,7 +57,7 @@ sip_out:
       'From: <sip:[% invite_emergency_pidflo_scenarios_test.testuser1002.phone_number %]@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'To: <sip:112@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
-      'Contact: sip:testuser1002@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Content-Length: 0',
       'P-LB-Uptime: \d+',
       'P-Asserted-Identity: <sip:[% invite_emergency_pidflo_scenarios_test.testuser1002.phone_number %]@invite-emergency-pidflo.scenarios.test>',
diff --git a/scenarios/invite_emergency_pidflo/0016_test.yml.tt2 b/scenarios/invite_emergency_pidflo/0016_test.yml.tt2
index f4e2533f..b7878c93 100644
--- a/scenarios/invite_emergency_pidflo/0016_test.yml.tt2
+++ b/scenarios/invite_emergency_pidflo/0016_test.yml.tt2
@@ -25,5 +25,5 @@ sip_out:
       'To: <sip:112@invite-emergency-pidflo.scenarios.test>;tag=[\w-]+',
       'CSeq: \d+ BYE',
       'Content-Length: 0',
-      'P-Out-Socket: udp:127.0.0.1:5060',
+      'P-Out-Socket: udp:[% server_ip %]:5060',
     ]
diff --git a/scenarios/invite_emergency_pidflo/sipp_scenario00.xml b/scenarios/invite_emergency_pidflo/sipp_scenario00.xml
index 750a70e4..b5921982 100644
--- a/scenarios/invite_emergency_pidflo/sipp_scenario00.xml
+++ b/scenarios/invite_emergency_pidflo/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