diff --git a/scenarios/invite_allowip_soundset/0001_test.yml.tt2 b/scenarios/invite_allowip_soundset/0001_test.yml.tt2
index 837effb4..93b3f6f2 100644
--- a/scenarios/invite_allowip_soundset/0001_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/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/invite_allowip_soundset/0003_test.yml.tt2 b/scenarios/invite_allowip_soundset/0003_test.yml.tt2
index ebdffce4..87250f99 100644
--- a/scenarios/invite_allowip_soundset/0003_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/0003_test.yml.tt2
@@ -93,7 +93,7 @@ flow:
   - exit|ROUTE_EXIT:
 sip_in:
   - '^INVITE'
-  - 'Contact: sip:testuser1002@'
+  - 'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>'
   - 'CSeq: 2 INVITE'
   - 'Max-Forwards: 69'
   - 'Content-Type: application/sdp'
@@ -114,7 +114,7 @@ sip_out:
       'From: <sip:testuser1002@',
       'To: <sip:testuser1003@',
       'CSeq: 2 INVITE',
-      'Contact: sip:testuser1002@[% scenarios.0.ip %]:[% scenarios.0.port %]',
+      'Contact: <sip:[% scenarios.0.username %]@[% scenarios.0.ip %]:[% scenarios.0.port %](;[^>]+)?>',
       'Max-Forwards: 68',
       'Content-Type: application/sdp',
       'Content-Length:   \d+',
diff --git a/scenarios/invite_allowip_soundset/0004_test.yml.tt2 b/scenarios/invite_allowip_soundset/0004_test.yml.tt2
index b3473778..2be49589 100644
--- a/scenarios/invite_allowip_soundset/0004_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/0004_test.yml.tt2
@@ -28,5 +28,5 @@ sip_out:
       'Contact: <sip:(earlyannounce@)?127.0.0.1:508[0|8](;transport=udp)?>',
       'Content-Type: application/sdp',
       'Content-Length: \d+',
-      'P-Out-Socket: udp:127.0.0.1:5060'
+      'P-Out-Socket: udp:[% server_ip %]:5060'
     ]
diff --git a/scenarios/invite_allowip_soundset/0005_test.yml.tt2 b/scenarios/invite_allowip_soundset/0005_test.yml.tt2
index 85288f09..7ca01310 100644
--- a/scenarios/invite_allowip_soundset/0005_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/0005_test.yml.tt2
@@ -44,5 +44,5 @@ sip_out:
       '^SIP/2.0 403 Unauthorized IP detected',
       'CSeq: 2 INVITE',
       'Content-Length: 0',
-      'P-Out-Socket: udp:127.0.0.1:5060'
+      'P-Out-Socket: udp:[% server_ip %]:5060'
     ]
diff --git a/scenarios/invite_allowip_soundset/prefs.json.tt2 b/scenarios/invite_allowip_soundset/prefs.json.tt2
index 4e0922fe..bf63d284 100644
--- a/scenarios/invite_allowip_soundset/prefs.json.tt2
+++ b/scenarios/invite_allowip_soundset/prefs.json.tt2
@@ -1,6 +1,6 @@
 {
 	"@invite-allowip-soundset.scenarios.test": {
-		"sound_set": "default_soundset"
+		"sound_set": "invite_allowip_soundset"
 	},
     "testuser1002@invite-allowip-soundset.scenarios.test": {
         "allowed_ips": [
diff --git a/scenarios/invite_allowip_soundset/sipp_scenario00.xml b/scenarios/invite_allowip_soundset/sipp_scenario00.xml
index 9820fc2f..e1047a33 100644
--- a/scenarios/invite_allowip_soundset/sipp_scenario00.xml
+++ b/scenarios/invite_allowip_soundset/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
@@ -95,7 +95,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: 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
 
diff --git a/scenarios/invite_allowip_soundset/soundsets.yml b/scenarios/invite_allowip_soundset/soundsets.yml
index 966a5ed3..ed6585eb 100644
--- a/scenarios/invite_allowip_soundset/soundsets.yml
+++ b/scenarios/invite_allowip_soundset/soundsets.yml
@@ -1,7 +1,8 @@
+---
 soundsets:
-  'default_soundset':
-      reseller_id: 1
-      sounds:
-        unauth_caller_ip:
-          filename: sounds/no_sh.wav
-          loopplay: 'false'
+  'invite_allowip_soundset':
+    reseller_id: 1
+    sounds:
+      unauth_caller_ip:
+        filename: sounds/no_sh.wav
+        loopplay: 'false'