diff --git a/scenarios/invite_allowip_soundset/0003_test.yml.tt2 b/scenarios/invite_allowip_soundset/0003_test.yml.tt2
index f1e8149b..ebdffce4 100644
--- a/scenarios/invite_allowip_soundset/0003_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/0003_test.yml.tt2
@@ -17,12 +17,12 @@ flow:
   - start|ROUTE_FIND_CALLER:
   - start|ROUTE_AUTH:
   - start|ROUTE_AUTH_HELPER:
-      $x_hdr(From): spce.test
+      $x_hdr(From): invite-allowip-soundset.scenarios.test
       $var(realm_user): testuser1002
-      $var(realm_domain): spce.test
+      $var(realm_domain): invite-allowip-soundset.scenarios.test
   - return|ROUTE_AUTH_HELPER:
       $avp(orig_acc_caller_user): ['testuser1002']
-      $avp(orig_acc_caller_domain): ['spce.test']
+      $avp(orig_acc_caller_domain): ['invite-allowip-soundset.scenarios.test']
   - start|ROUTE_ADD_CALLINFO_REPLY:
   - start|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
   - return|ROUTE_ADD_CALLINFO_CALLER_PRIMARY:
@@ -114,14 +114,14 @@ sip_out:
       'From: <sip:testuser1002@',
       'To: <sip:testuser1003@',
       'CSeq: 2 INVITE',
-      'Contact: sip:testuser1002@127.126.0.1:\d+',
+      'Contact: sip:testuser1002@[% scenarios.0.ip %]:[% scenarios.0.port %]',
       'Max-Forwards: 68',
       'Content-Type: application/sdp',
       'Content-Length:   \d+',
       'P-App-Param: audio_id=\d+;play_looped=no;fr_code=403;fr_reason=Unauthorized IP detected',
       'P-App-Name: early_dbprompt',
-      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-Callee-UUID: [% spce_test.testuser1002.uuid %]',
-      'P-NGCP-Caller-Info: <sip:testuser1002@spce.test>;ip=127.126.0.1;port=\d+;primary=4311002',
-      'P-NGCP-Callee-Info: <sip:testuser1003@spce.test>;ip=127.0.0.1;port=5080;primary=4311002',
+      'P-Caller-UUID: [% invite_allowip_soundset_scenarios_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% invite_allowip_soundset_scenarios_test.testuser1002.uuid %]',
+      'P-NGCP-Caller-Info: <sip:testuser1002@invite-allowip-soundset.scenarios.test>;ip=[% scenarios.0.ip %];port=[% scenarios.0.port %];primary=[% invite_allowip_soundset_scenarios_test.testuser1002.phone_number %]',
+      'P-NGCP-Callee-Info: <sip:testuser1003@invite-allowip-soundset.scenarios.test>;ip=127.0.0.1;port=5080;primary=[% invite_allowip_soundset_scenarios_test.testuser1002.phone_number %]',
     ]
diff --git a/scenarios/invite_allowip_soundset/0005_test.yml.tt2 b/scenarios/invite_allowip_soundset/0005_test.yml.tt2
index edddd44e..85288f09 100644
--- a/scenarios/invite_allowip_soundset/0005_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/0005_test.yml.tt2
@@ -27,15 +27,15 @@ flow:
   - return|dialog:failed:
 sip_in:
   - '^SIP/2.0 403 Unauthorized IP detected'
-  - 'From: <sip:testuser1002@spce.test>;tag='
-  - 'To: <sip:testuser1003@spce.test>;tag='
+  - 'From: <sip:testuser1002@invite-allowip-soundset.scenarios.test>;tag='
+  - 'To: <sip:testuser1003@invite-allowip-soundset.scenarios.test>;tag='
   - 'CSeq: 2 INVITE'
   - 'Content-Length: 0'
 sip_out:
   - [
       '^ACK sip:earlyannounce@app.local SIP/2.0',
-      'From: <sip:testuser1002@spce.test>;tag=',
-      'To: <sip:testuser1003@spce.test>;tag=',
+      'From: <sip:testuser1002@invite-allowip-soundset.scenarios.test>;tag=',
+      'To: <sip:testuser1003@invite-allowip-soundset.scenarios.test>;tag=',
       'CSeq: 2 ACK',
       'Max-Forwards: 68',
       'Content-Length: 0'
diff --git a/scenarios/invite_allowip_soundset/0006_test.yml.tt2 b/scenarios/invite_allowip_soundset/0006_test.yml.tt2
index 3d2ddc34..1e9e2cba 100644
--- a/scenarios/invite_allowip_soundset/0006_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/0006_test.yml.tt2
@@ -12,9 +12,9 @@ flow:
   - start|ROUTE_LOCAL:
   - return|ROUTE_LOCAL:
 sip_in:
-  - '^ACK sip:testuser1003@spce.test'
-  - 'From: <sip:testuser1002@spce.test>;tag='
-  - 'To: <sip:testuser1003@spce.test>;tag='
+  - '^ACK sip:testuser1003@invite-allowip-soundset.scenarios.test'
+  - 'From: <sip:testuser1002@invite-allowip-soundset.scenarios.test>;tag='
+  - 'To: <sip:testuser1003@invite-allowip-soundset.scenarios.test>;tag='
   - 'CSeq: 2 ACK'
   - 'Max-Forwards: 69'
   - 'Content-Length: 0'
diff --git a/scenarios/invite_allowip_soundset/cdr_test.yml.tt2 b/scenarios/invite_allowip_soundset/cdr_test.yml.tt2
index ffce6dc6..5fbd393c 100644
--- a/scenarios/invite_allowip_soundset/cdr_test.yml.tt2
+++ b/scenarios/invite_allowip_soundset/cdr_test.yml.tt2
@@ -1,9 +1,9 @@
 cdr:
   - source_user: 'testuser1002'
-    source_domain: 'spce.test'
+    source_domain: 'invite-allowip-soundset.scenarios.test'
     source_cli: '0'
     destination_user: 'testuser1003'
-    destination_domain: 'spce.test'
+    destination_domain: 'invite-allowip-soundset.scenarios.test'
     destination_user_dialed: 'testuser1003'
     call_type: 'call'
     call_status: 'other'
diff --git a/scenarios/invite_allowip_soundset/prefs.json b/scenarios/invite_allowip_soundset/prefs.json
deleted file mode 100644
index c18696fb..00000000
--- a/scenarios/invite_allowip_soundset/prefs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"@spce.test": {
-		"sound_set": "default_soundset"
-	},
-    "testuser1002@spce.test": {
-        "allowed_ips": [
-            "1.2.3.4"
-        ],
-        "cli": 4311002
-    }
-}
diff --git a/scenarios/invite_allowip_soundset/prefs.json.tt2 b/scenarios/invite_allowip_soundset/prefs.json.tt2
new file mode 100644
index 00000000..4e0922fe
--- /dev/null
+++ b/scenarios/invite_allowip_soundset/prefs.json.tt2
@@ -0,0 +1,11 @@
+{
+	"@invite-allowip-soundset.scenarios.test": {
+		"sound_set": "default_soundset"
+	},
+    "testuser1002@invite-allowip-soundset.scenarios.test": {
+        "allowed_ips": [
+            "1.2.3.4"
+        ],
+        "cli": [% invite_allowip_soundset_scenarios_test.testuser1002.phone_number %]
+    }
+}
diff --git a/scenarios/invite_allowip_soundset/scenario.yml b/scenarios/invite_allowip_soundset/scenario.yml
index 3f131b79..b523c03f 100644
--- a/scenarios/invite_allowip_soundset/scenario.yml
+++ b/scenarios/invite_allowip_soundset/scenario.yml
@@ -1,6 +1,7 @@
+---
 test_uuid: invite_allowip_soundset
 domains:
-  'spce.test':
+  invite-allowip-soundset.scenarios.test:
     reseller_id: 1
 customers:
   'customer.test':
@@ -13,7 +14,7 @@ customers:
       billing_profile_id: 1
       reseller_id: 1
 subscribers:
-  spce.test:
+  invite-allowip-soundset.scenarios.test:
     testuser1003:
       customer: 'customer.test'
       password: testuser
@@ -29,10 +30,10 @@ subscribers:
 scenarios:
   - ip: 127.126.0.1
     username: testuser1002
-    domain: spce.test
+    domain: invite-allowip-soundset.scenarios.test
     responders:
       - ip: 127.1.0.1
         username: testuser1003
-        domain: spce.test
-        register: no
-        active: no
+        domain: invite-allowip-soundset.scenarios.test
+        register: 'no'
+        active: 'no'